[Boost-commit] svn:boost r46743 - in branches/release: boost/archive boost/archive/array boost/archive/detail boost/archive/impl boost/archive/iterators boost/mpi boost/mpi/detail boost/serialization boost/serialization/detail libs/mpi/build libs/mpi/doc libs/mpi/src libs/mpi/src/python libs/mpi/test libs/serialization/borland6ide libs/serialization/build libs/serialization/doc libs/serialization/example libs/serialization/src libs/serialization/test libs/serialization/util libs/serialization/vc6ide libs/serialization/vc7ide

From: troyer_at_[hidden]
Date: 2008-06-26 15:26:12

Author: troyer
Date: 2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
New Revision: 46743
URL: http://svn.boost.org/trac/boost/changeset/46743

Log:
Moved Serialization and MPI fixes and updates from trunk to release branch
Added:
   branches/release/boost/archive/detail/polymorphic_iarchive_route.hpp   (contents, props changed)
   branches/release/boost/archive/detail/polymorphic_oarchive_route.hpp   (contents, props changed)
   branches/release/boost/archive/xml_archive_exception.hpp   (contents, props changed)
   branches/release/boost/mpi/detail/binary_buffer_iprimitive.hpp   (contents, props changed)
   branches/release/boost/mpi/detail/binary_buffer_oprimitive.hpp   (contents, props changed)
   branches/release/boost/serialization/assume_abstract.hpp   (contents, props changed)
   branches/release/boost/serialization/factory.hpp   (contents, props changed)
   branches/release/boost/serialization/singleton.hpp   (contents, props changed)
   branches/release/libs/mpi/src/python/py_nonblocking.cpp   (contents, props changed)
   branches/release/libs/mpi/src/python/request_with_value.hpp   (contents, props changed)
   branches/release/libs/serialization/doc/new_case_studies.html   (contents, props changed)
   branches/release/libs/serialization/doc/performance_status.html   (contents, props changed)
   branches/release/libs/serialization/doc/profile1.txt   (contents, props changed)
   branches/release/libs/serialization/doc/profile2.txt   (contents, props changed)
   branches/release/libs/serialization/doc/profile3.txt   (contents, props changed)
   branches/release/libs/serialization/doc/singleton.html   (contents, props changed)
   branches/release/libs/serialization/doc/todo.html   (contents, props changed)
   branches/release/libs/serialization/example/Jamfile.v2   (contents, props changed)
   branches/release/libs/serialization/example/demo_dll.cpp   (contents, props changed)
   branches/release/libs/serialization/example/demo_dll_a.hpp   (contents, props changed)
   branches/release/libs/serialization/example/demo_dll_a.ipp   (contents, props changed)
   branches/release/libs/serialization/example/demo_dll_b.hpp   (contents, props changed)
   branches/release/libs/serialization/example/demo_dll_b.ipp   (contents, props changed)
   branches/release/libs/serialization/example/demo_xml.hpp   (contents, props changed)
   branches/release/libs/serialization/example/polymorphic_portable_binary_iarchive.cpp   (contents, props changed)
   branches/release/libs/serialization/example/polymorphic_portable_binary_iarchive.hpp   (contents, props changed)
   branches/release/libs/serialization/example/polymorphic_portable_binary_oarchive.cpp   (contents, props changed)
   branches/release/libs/serialization/example/polymorphic_portable_binary_oarchive.hpp   (contents, props changed)
   branches/release/libs/serialization/example/portable_binary_archive.hpp   (contents, props changed)
   branches/release/libs/serialization/example/portable_binary_iarchive.cpp   (contents, props changed)
   branches/release/libs/serialization/example/portable_binary_oarchive.cpp   (contents, props changed)
Removed:
   branches/release/boost/archive/array/
   branches/release/boost/archive/detail/dynamically_initialized.hpp
   branches/release/boost/archive/detail/polymorphic_iarchive_dispatch.hpp
   branches/release/boost/archive/detail/polymorphic_oarchive_dispatch.hpp
   branches/release/boost/serialization/is_abstract.hpp
   branches/release/libs/serialization/borland6ide/
   branches/release/libs/serialization/build/serialization.jam
   branches/release/libs/serialization/vc6ide/
   branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.suo
Text files modified: 
   branches/release/boost/archive/basic_archive.hpp                          |     4                                         
   branches/release/boost/archive/basic_binary_iarchive.hpp                  |    16                                         
   branches/release/boost/archive/basic_binary_iprimitive.hpp                |    31                                         
   branches/release/boost/archive/basic_binary_oarchive.hpp                  |    18                                         
   branches/release/boost/archive/basic_binary_oprimitive.hpp                |     8                                         
   branches/release/boost/archive/basic_streambuf_locale_saver.hpp           |     3                                         
   branches/release/boost/archive/basic_text_iarchive.hpp                    |    10                                         
   branches/release/boost/archive/basic_text_iprimitive.hpp                  |     4                                         
   branches/release/boost/archive/basic_text_oarchive.hpp                    |     2                                         
   branches/release/boost/archive/basic_text_oprimitive.hpp                  |     8                                         
   branches/release/boost/archive/basic_xml_archive.hpp                      |    35 -                                       
   branches/release/boost/archive/binary_iarchive.hpp                        |     1                                         
   branches/release/boost/archive/binary_iarchive_impl.hpp                   |     2                                         
   branches/release/boost/archive/binary_oarchive.hpp                        |     1                                         
   branches/release/boost/archive/binary_oarchive_impl.hpp                   |     2                                         
   branches/release/boost/archive/codecvt_null.hpp                           |    28                                         
   branches/release/boost/archive/detail/abi_suffix.hpp                      |     8                                         
   branches/release/boost/archive/detail/archive_pointer_iserializer.hpp     |     4                                         
   branches/release/boost/archive/detail/archive_pointer_oserializer.hpp     |     3                                         
   branches/release/boost/archive/detail/auto_link_archive.hpp               |    37                                         
   branches/release/boost/archive/detail/auto_link_warchive.hpp              |     2                                         
   branches/release/boost/archive/detail/basic_config.hpp                    |     2                                         
   branches/release/boost/archive/detail/basic_iarchive.hpp                  |    26                                         
   branches/release/boost/archive/detail/basic_iserializer.hpp               |    17                                         
   branches/release/boost/archive/detail/basic_oarchive.hpp                  |     8                                         
   branches/release/boost/archive/detail/basic_oserializer.hpp               |    12                                         
   branches/release/boost/archive/detail/basic_pointer_iserializer.hpp       |     6                                         
   branches/release/boost/archive/detail/basic_pointer_oserializer.hpp       |     8                                         
   branches/release/boost/archive/detail/basic_serializer.hpp                |    20                                         
   branches/release/boost/archive/detail/basic_serializer_map.hpp            |    30                                         
   branches/release/boost/archive/detail/common_iarchive.hpp                 |     4                                         
   branches/release/boost/archive/detail/common_oarchive.hpp                 |     4                                         
   branches/release/boost/archive/detail/decl.hpp                            |     2                                         
   branches/release/boost/archive/detail/interface_iarchive.hpp              |    12                                         
   branches/release/boost/archive/detail/interface_oarchive.hpp              |    14                                         
   branches/release/boost/archive/detail/iserializer.hpp                     |   134 +--                                     
   branches/release/boost/archive/detail/oserializer.hpp                     |   206 ++---                                   
   branches/release/boost/archive/detail/register_archive.hpp                |    16                                         
   branches/release/boost/archive/detail/utf8_codecvt_facet.hpp              |     2                                         
   branches/release/boost/archive/impl/archive_pointer_iserializer.ipp       |    55 +                                       
   branches/release/boost/archive/impl/archive_pointer_oserializer.ipp       |    51 +                                       
   branches/release/boost/archive/impl/basic_binary_iarchive.ipp             |     1                                         
   branches/release/boost/archive/impl/basic_binary_iprimitive.ipp           |    10                                         
   branches/release/boost/archive/impl/basic_binary_oprimitive.ipp           |     6                                         
   branches/release/boost/archive/impl/basic_text_iarchive.ipp               |     1                                         
   branches/release/boost/archive/impl/basic_text_iprimitive.ipp             |    10                                         
   branches/release/boost/archive/impl/basic_text_oprimitive.ipp             |     8                                         
   branches/release/boost/archive/impl/basic_xml_iarchive.ipp                |     2                                         
   branches/release/boost/archive/impl/basic_xml_oarchive.ipp                |    16                                         
   branches/release/boost/archive/impl/text_iarchive_impl.ipp                |     5                                         
   branches/release/boost/archive/impl/text_wiarchive_impl.ipp               |     2                                         
   branches/release/boost/archive/impl/xml_iarchive_impl.ipp                 |     7                                         
   branches/release/boost/archive/impl/xml_wiarchive_impl.ipp                |     6                                         
   branches/release/boost/archive/iterators/escape.hpp                       |     1                                         
   branches/release/boost/archive/iterators/insert_linebreaks.hpp            |     2                                         
   branches/release/boost/archive/iterators/istream_iterator.hpp             |     1                                         
   branches/release/boost/archive/iterators/remove_whitespace.hpp            |     2                                         
   branches/release/boost/archive/polymorphic_binary_iarchive.hpp            |     6                                         
   branches/release/boost/archive/polymorphic_binary_oarchive.hpp            |     4                                         
   branches/release/boost/archive/polymorphic_iarchive.hpp                   |    21                                         
   branches/release/boost/archive/polymorphic_oarchive.hpp                   |    21                                         
   branches/release/boost/archive/polymorphic_text_iarchive.hpp              |     6                                         
   branches/release/boost/archive/polymorphic_text_oarchive.hpp              |     4                                         
   branches/release/boost/archive/polymorphic_text_wiarchive.hpp             |     4                                         
   branches/release/boost/archive/polymorphic_text_woarchive.hpp             |     4                                         
   branches/release/boost/archive/polymorphic_xml_iarchive.hpp               |     6                                         
   branches/release/boost/archive/polymorphic_xml_oarchive.hpp               |     4                                         
   branches/release/boost/archive/polymorphic_xml_wiarchive.hpp              |     4                                         
   branches/release/boost/archive/polymorphic_xml_woarchive.hpp              |     4                                         
   branches/release/boost/archive/shared_ptr_helper.hpp                      |    10                                         
   branches/release/boost/archive/tmpdir.hpp                                 |     1                                         
   branches/release/boost/archive/xml_wiarchive.hpp                          |     2                                         
   branches/release/boost/archive/xml_woarchive.hpp                          |     2                                         
   branches/release/boost/mpi/communicator.hpp                               |    18                                         
   branches/release/boost/mpi/config.hpp                                     |     5                                         
   branches/release/boost/mpi/datatype.hpp                                   |    26                                         
   branches/release/boost/mpi/datatype_fwd.hpp                               |     2                                         
   branches/release/boost/mpi/detail/content_oarchive.hpp                    |     2                                         
   branches/release/boost/mpi/detail/forward_iprimitive.hpp                  |    26                                         
   branches/release/boost/mpi/detail/forward_oprimitive.hpp                  |    26                                         
   branches/release/boost/mpi/detail/forward_skeleton_iarchive.hpp           |    25                                         
   branches/release/boost/mpi/detail/forward_skeleton_oarchive.hpp           |    25                                         
   branches/release/boost/mpi/detail/ignore_skeleton_oarchive.hpp            |    17                                         
   branches/release/boost/mpi/detail/mpi_datatype_cache.hpp                  |     8                                         
   branches/release/boost/mpi/detail/mpi_datatype_oarchive.hpp               |     1                                         
   branches/release/boost/mpi/detail/packed_iprimitive.hpp                   |    15                                         
   branches/release/boost/mpi/detail/text_skeleton_oarchive.hpp              |     5                                         
   branches/release/boost/mpi/packed_iarchive.hpp                            |    46 +                                       
   branches/release/boost/mpi/packed_oarchive.hpp                            |    37                                         
   branches/release/boost/mpi/skeleton_and_content.hpp                       |     3                                         
   branches/release/boost/mpi/status.hpp                                     |     2                                         
   branches/release/boost/serialization/array.hpp                            |   100 +-                                      
   branches/release/boost/serialization/base_object.hpp                      |    77 +-                                      
   branches/release/boost/serialization/binary_object.hpp                    |     2                                         
   branches/release/boost/serialization/collection_traits.hpp                |    16                                         
   branches/release/boost/serialization/collections_load_imp.hpp             |    73 +                                       
   branches/release/boost/serialization/complex.hpp                          |    43                                         
   branches/release/boost/serialization/config.hpp                           |    74 +                                       
   branches/release/boost/serialization/deque.hpp                            |     2                                         
   branches/release/boost/serialization/detail/shared_count_132.hpp          |    26                                         
   branches/release/boost/serialization/detail/shared_ptr_132.hpp            |     2                                         
   branches/release/boost/serialization/ephemeral.hpp                        |     5                                         
   branches/release/boost/serialization/export.hpp                           |   124 +-                                      
   branches/release/boost/serialization/extended_type_info.hpp               |    66 +                                       
   branches/release/boost/serialization/extended_type_info_no_rtti.hpp       |    86 +-                                      
   branches/release/boost/serialization/extended_type_info_typeid.hpp        |   121 +-                                      
   branches/release/boost/serialization/force_include.hpp                    |     4                                         
   branches/release/boost/serialization/hash_map.hpp                         |     4                                         
   branches/release/boost/serialization/hash_set.hpp                         |     4                                         
   branches/release/boost/serialization/map.hpp                              |     4                                         
   branches/release/boost/serialization/optional.hpp                         |     3                                         
   branches/release/boost/serialization/serialization.hpp                    |     7                                         
   branches/release/boost/serialization/set.hpp                              |     4                                         
   branches/release/boost/serialization/shared_ptr.hpp                       |     1                                         
   branches/release/boost/serialization/shared_ptr_132.hpp                   |    12                                         
   branches/release/boost/serialization/slist.hpp                            |     9                                         
   branches/release/boost/serialization/type_info_implementation.hpp         |     2                                         
   branches/release/boost/serialization/utility.hpp                          |     1                                         
   branches/release/boost/serialization/valarray.hpp                         |     6                                         
   branches/release/boost/serialization/variant.hpp                          |    10                                         
   branches/release/boost/serialization/vector.hpp                           |    14                                         
   branches/release/boost/serialization/void_cast.hpp                        |   156 +--                                     
   branches/release/boost/serialization/void_cast_fwd.hpp                    |     3                                         
   branches/release/boost/serialization/weak_ptr.hpp                         |     4                                         
   branches/release/libs/mpi/build/Jamfile.v2                                |     1                                         
   branches/release/libs/mpi/build/__init__.py                               |     4                                         
   branches/release/libs/mpi/doc/mpi.qbk                                     |     3                                         
   branches/release/libs/mpi/src/content_oarchive.cpp                        |     3                                         
   branches/release/libs/mpi/src/mpi_datatype_cache.cpp                      |    35                                         
   branches/release/libs/mpi/src/packed_skeleton_iarchive.cpp                |     4                                         
   branches/release/libs/mpi/src/packed_skeleton_oarchive.cpp                |     3                                         
   branches/release/libs/mpi/src/point_to_point.cpp                          |     2                                         
   branches/release/libs/mpi/src/python/documentation.cpp                    |   150 +++                                     
   branches/release/libs/mpi/src/python/module.cpp                           |     4                                         
   branches/release/libs/mpi/src/python/py_communicator.cpp                  |    13                                         
   branches/release/libs/mpi/src/python/py_exception.cpp                     |     9                                         
   branches/release/libs/mpi/src/python/py_request.cpp                       |    90 +                                       
   branches/release/libs/mpi/src/python/py_timer.cpp                         |     2                                         
   branches/release/libs/mpi/src/python/skeleton_and_content.cpp             |    21                                         
   branches/release/libs/mpi/src/python/status.cpp                           |     2                                         
   branches/release/libs/mpi/test/broadcast_test.cpp                         |     1                                         
   branches/release/libs/serialization/build/Jamfile.v2                      |    76 +                                       
   branches/release/libs/serialization/doc/acknowledgments.html              |     4                                         
   branches/release/libs/serialization/doc/archive_reference.html            |    65 +                                       
   branches/release/libs/serialization/doc/archives.html                     |    22                                         
   branches/release/libs/serialization/doc/class_diagram.html                |    14                                         
   branches/release/libs/serialization/doc/codecvt.html                      |     2                                         
   branches/release/libs/serialization/doc/contents.html                     |    41 +                                       
   branches/release/libs/serialization/doc/exceptions.html                   |     5                                         
   branches/release/libs/serialization/doc/extended_type_info.html           |   241 +++---                                  
   branches/release/libs/serialization/doc/headers.html                      |     2                                         
   branches/release/libs/serialization/doc/implementation.html               |    24                                         
   branches/release/libs/serialization/doc/rationale.html                    |     6                                         
   branches/release/libs/serialization/doc/release.html                      |    85 +                                       
   branches/release/libs/serialization/doc/serialization.html                |    19                                         
   branches/release/libs/serialization/doc/shared_ptr2.html                  |    12                                         
   branches/release/libs/serialization/doc/special.html                      |   283 +++++--                                 
   branches/release/libs/serialization/doc/static_warning.html               |    20                                         
   branches/release/libs/serialization/doc/traits.html                       |    60 +                                       
   branches/release/libs/serialization/doc/tutorial.html                     |     2                                         
   branches/release/libs/serialization/doc/void_cast.html                    |     4                                         
   branches/release/libs/serialization/example/demo.cpp                      |     5                                         
   branches/release/libs/serialization/example/demo_exception.cpp            |     1                                         
   branches/release/libs/serialization/example/demo_gps.hpp                  |     2                                         
   branches/release/libs/serialization/example/demo_portable_archive.cpp     |    44 +                                       
   branches/release/libs/serialization/example/demo_shared_ptr.cpp           |    11                                         
   branches/release/libs/serialization/example/portable_binary_iarchive.hpp  |   215 +++--                                   
   branches/release/libs/serialization/example/portable_binary_oarchive.hpp  |   207 +++--                                   
   branches/release/libs/serialization/src/basic_archive.cpp                 |     2                                         
   branches/release/libs/serialization/src/basic_iarchive.cpp                |    37                                         
   branches/release/libs/serialization/src/basic_iserializer.cpp             |     4                                         
   branches/release/libs/serialization/src/basic_oarchive.cpp                |    18                                         
   branches/release/libs/serialization/src/basic_oserializer.cpp             |     4                                         
   branches/release/libs/serialization/src/basic_serializer_map.cpp          |    59                                         
   branches/release/libs/serialization/src/basic_xml_grammar.ipp             |    11                                         
   branches/release/libs/serialization/src/binary_iarchive.cpp               |    16                                         
   branches/release/libs/serialization/src/binary_oarchive.cpp               |     8                                         
   branches/release/libs/serialization/src/codecvt_null.cpp                  |    10                                         
   branches/release/libs/serialization/src/extended_type_info.cpp            |   316 ++------                                
   branches/release/libs/serialization/src/extended_type_info_no_rtti.cpp    |    37                                         
   branches/release/libs/serialization/src/extended_type_info_typeid.cpp     |   102 ++                                      
   branches/release/libs/serialization/src/void_cast.cpp                     |   361 ++++-----                               
   branches/release/libs/serialization/src/xml_grammar.cpp                   |     2                                         
   branches/release/libs/serialization/src/xml_woarchive.cpp                 |     2                                         
   branches/release/libs/serialization/test/Jamfile.v2                       |     4                                         
   branches/release/libs/serialization/util/test.jam                         |     2                                         
   branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln  |  1397 +++++++++++++++++++++++++++++++++++++-- 
   branches/release/libs/serialization/vc7ide/Library.vcproj                 |   124 ++                                      
   branches/release/libs/serialization/vc7ide/LibraryW.vcproj                |    86 ++                                      
   branches/release/libs/serialization/vc7ide/demo.vcproj                    |    94 ++                                      
   branches/release/libs/serialization/vc7ide/demo_auto_ptr.vcproj           |    89 ++                                      
   branches/release/libs/serialization/vc7ide/demo_exception.vcproj          |    89 ++                                      
   branches/release/libs/serialization/vc7ide/demo_fast_archive.vcproj       |    89 ++                                      
   branches/release/libs/serialization/vc7ide/demo_pimpl.vcproj              |    89 ++                                      
   branches/release/libs/serialization/vc7ide/demo_polymorphic.vcproj        |    93 ++                                      
   branches/release/libs/serialization/vc7ide/demo_portable_archive.vcproj   |   132 +++                                     
   branches/release/libs/serialization/vc7ide/demo_shared_ptr.vcproj         |    89 ++                                      
   branches/release/libs/serialization/vc7ide/demo_xml.vcproj                |    89 ++                                      
   branches/release/libs/serialization/vc7ide/demo_xml_load.vcproj           |    89 ++                                      
   branches/release/libs/serialization/vc7ide/demo_xml_save.vcproj           |    89 ++                                      
   branches/release/libs/serialization/vc7ide/test_array.vcproj              |   171 +++-                                    
   branches/release/libs/serialization/vc7ide/test_binary.vcproj             |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_class_info_load.vcproj    |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_class_info_save.vcproj    |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_codecvt_null.vcproj       |    87 ++                                      
   branches/release/libs/serialization/vc7ide/test_const.vcproj              |    36                                         
   branches/release/libs/serialization/vc7ide/test_const_fail.vcproj         |   116 ++                                      
   branches/release/libs/serialization/vc7ide/test_const_pass.vcproj         |   102 ++                                      
   branches/release/libs/serialization/vc7ide/test_contained_class.vcproj    |   152 ++-                                     
   branches/release/libs/serialization/vc7ide/test_cyclic_ptrs.vcproj        |   168 ++-                                     
   branches/release/libs/serialization/vc7ide/test_delete_pointer.vcproj     |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_deque.vcproj              |   169 ++-                                     
   branches/release/libs/serialization/vc7ide/test_derived.vcproj            |   158 ++-                                     
   branches/release/libs/serialization/vc7ide/test_derived_class.vcproj      |   155 ++-                                     
   branches/release/libs/serialization/vc7ide/test_derived_class_ptr.vcproj  |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_diamond.vcproj            |   158 ++-                                     
   branches/release/libs/serialization/vc7ide/test_exported.vcproj           |   177 +++-                                    
   branches/release/libs/serialization/vc7ide/test_inclusion.vcproj          |    90 ++                                      
   branches/release/libs/serialization/vc7ide/test_iterators.vcproj          |    81 +                                       
   branches/release/libs/serialization/vc7ide/test_iterators_base64.vcproj   |    81 +                                       
   branches/release/libs/serialization/vc7ide/test_list.vcproj               |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_list_ptrs.vcproj          |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_map.vcproj                |   168 ++-                                     
   branches/release/libs/serialization/vc7ide/test_mi.vcproj                 |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_mult_archive_types.vcproj |    87 ++                                      
   branches/release/libs/serialization/vc7ide/test_multiple_ptrs.vcproj      |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_no_rtti.vcproj            |   170 +++-                                    
   branches/release/libs/serialization/vc7ide/test_non_default_ctor.vcproj   |   157 ++-                                     
   branches/release/libs/serialization/vc7ide/test_non_default_ctor2.vcproj  |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_non_intrusive.vcproj      |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_not_serializable.vcproj   |    34                                         
   branches/release/libs/serialization/vc7ide/test_null_ptr.vcproj           |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_nvp.vcproj                |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_object.vcproj             |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_optional.vcproj           |   165 ++-                                     
   branches/release/libs/serialization/vc7ide/test_polymorphic.vcproj        |   160 ++-                                     
   branches/release/libs/serialization/vc7ide/test_primitive.vcproj          |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_private_ctor.vcproj       |    87 ++                                      
   branches/release/libs/serialization/vc7ide/test_recursion.vcproj          |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_recusion.vcproj           |   120 +-                                      
   branches/release/libs/serialization/vc7ide/test_registered.vcproj         |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_reset_object_addr.vcproj  |    93 ++                                      
   branches/release/libs/serialization/vc7ide/test_set.vcproj                |   151 ++-                                     
   branches/release/libs/serialization/vc7ide/test_shared_ptr.vcproj         |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_shared_ptr_132.vcproj     |   189 +++-                                    
   branches/release/libs/serialization/vc7ide/test_simple_class.vcproj       |   169 +++-                                    
   branches/release/libs/serialization/vc7ide/test_simple_class_ptr.vcproj   |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_smart_cast.vcproj         |    77 +                                       
   branches/release/libs/serialization/vc7ide/test_split.vcproj              |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_static_warning.vcproj     |    77 +                                       
   branches/release/libs/serialization/vc7ide/test_tracking.vcproj           |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_traits_fail.vcproj        |    95 ++                                      
   branches/release/libs/serialization/vc7ide/test_traits_pass.vcproj        |    93 ++                                      
   branches/release/libs/serialization/vc7ide/test_unregistered.vcproj       |   150 ++-                                     
   branches/release/libs/serialization/vc7ide/test_utf8_codecvt.vcproj       |    75 +                                       
   branches/release/libs/serialization/vc7ide/test_variant.vcproj            |   156 ++-                                     
   branches/release/libs/serialization/vc7ide/test_vector.vcproj             |   168 ++-                                     
   branches/release/libs/serialization/vc7ide/test_void_cast.vcproj          |   104 ++                                      
   258 files changed, 10234 insertions(+), 5455 deletions(-)

Modified: branches/release/boost/archive/basic_archive.hpp
==============================================================================
--- branches/release/boost/archive/basic_archive.hpp	(original)
+++ branches/release/boost/archive/basic_archive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -86,8 +86,8 @@
     no_header = 1,  // suppress archive header info
     no_codecvt = 2,  // suppress alteration of codecvt facet
     no_xml_tag_checking = 4,   // suppress checking of xml tags
-    no_tracking = 8           // suppress ALL tracking
-//    no_object_creation = 16    // don't create any new objects
+    no_tracking = 8,           // suppress ALL tracking
+    flags_last = 8
 };
 
 #define NULL_POINTER_TAG class_id_type(-1)

Modified: branches/release/boost/archive/basic_binary_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iarchive.hpp	(original)
+++ branches/release/boost/archive/basic_binary_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,15 +22,15 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 //  See http://www.boost.org for updates, documentation, and revision history.
-//#include <cstring>
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/pfto.hpp>
 
-#include <boost/serialization/string.hpp>
+#include <boost/archive/detail/common_iarchive.hpp>
 #include <boost/serialization/collection_size_type.hpp>
-#include <boost/archive/array/iarchive.hpp>
+#include <boost/serialization/string.hpp>
+
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost { 
@@ -40,7 +40,7 @@
 // class basic_binary_iarchive - read serialized objects from a input binary stream
 template<class Archive>
 class basic_binary_iarchive : 
-    public array::iarchive<Archive>
+    public detail::common_iarchive<Archive>
 {
 protected:
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
@@ -56,10 +56,10 @@
     // fot templates in the absence of partial function 
     // template ordering. If we get here pass to base class
     // note extra nonsense to sneak it pass the borland compiers
-    typedef array::iarchive<Archive> array_iarchive;
+    typedef detail::common_iarchive<Archive> detail_common_iarchive;
     template<class T>
-    void load_override(T & t, BOOST_PFTO int){
-        this->array_iarchive::load_override(t, 0);
+    void load_override(T & t, BOOST_PFTO int version){
+      this->detail_common_iarchive::load_override(t, static_cast<int>(version));
     }
     // binary files don't include the optional information 
     void load_override(class_id_optional_type & /* t */, int){}
@@ -113,7 +113,7 @@
     init();
    
     basic_binary_iarchive(unsigned int flags) :
-        array_iarchive(flags)
+        detail::common_iarchive<Archive>(flags)
     {}
 };
 

Modified: branches/release/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iprimitive.hpp	(original)
+++ branches/release/boost/archive/basic_binary_iprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -6,6 +6,10 @@
 # pragma once
 #endif
 
+#if defined(_MSC_VER)
+#pragma warning( disable : 4800 )
+#endif
+
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // basic_binary_iprimitive.hpp
 //
@@ -72,8 +76,11 @@
     Archive * This(){
         return static_cast<Archive *>(this);
     }
+
+    #ifndef BOOST_NO_STD_LOCALE
     boost::scoped_ptr<std::locale> archive_locale;
     basic_streambuf_locale_saver<Elem, Tr> locale_saver;
+    #endif
 
     // main template for serilization of primitive types
     template<class T>
@@ -137,28 +144,6 @@
     void *address, 
     std::size_t count
 ){
-#if 0
-    assert(
-        static_cast<std::size_t>((std::numeric_limits<std::streamsize>::max)()) >= count
-    );
-    //if(is.fail())
-    //    boost::throw_exception(archive_exception(archive_exception::stream_error));
-    // note: an optimizer should eliminate the following for char files
-    std::size_t s = count / sizeof(BOOST_DEDUCED_TYPENAME IStream::char_type);
-    is.read(
-        static_cast<BOOST_DEDUCED_TYPENAME IStream::char_type *>(address), 
-        s
-    );
-    // note: an optimizer should eliminate the following for char files
-    s = count % sizeof(BOOST_DEDUCED_TYPENAME IStream::char_type);
-    if(0 < s){
-        if(is.fail())
-            boost::throw_exception(archive_exception(archive_exception::stream_error));
-        BOOST_DEDUCED_TYPENAME IStream::char_type t;
-        is.read(& t, 1);
-        std::memcpy(address, &t, s);
-    }
-#endif
     // note: an optimizer should eliminate the following for char files
     std::streamsize s = count / sizeof(Elem);
     std::streamsize scount = m_sb.sgetn(
@@ -180,7 +165,7 @@
             boost::throw_exception(
                 archive_exception(archive_exception::stream_error)
             );
-        std::memcpy(address, &t, s);
+        std::memcpy(static_cast<char*>(address) + (count - s), &t, s);
     }
 }
 

Modified: branches/release/boost/archive/basic_binary_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oarchive.hpp	(original)
+++ branches/release/boost/archive/basic_binary_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -27,10 +27,9 @@
 #include <boost/pfto.hpp>
 
 #include <boost/detail/workaround.hpp>
-#include <boost/archive/array/oarchive.hpp>
+#include <boost/archive/detail/common_oarchive.hpp>
 #include <boost/serialization/string.hpp>
 #include <boost/serialization/collection_size_type.hpp>
-#include <boost/archive/array/oarchive.hpp>
 
 namespace boost {
 namespace archive {
@@ -45,7 +44,7 @@
 // of time.  So under some circumstances it may be he right choice.
 template<class Archive>
 class basic_binary_oarchive : 
-    public array::oarchive<Archive>
+    public archive::detail::common_oarchive<Archive>
 {
 protected:
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
@@ -58,15 +57,12 @@
     friend class detail::interface_oarchive<Archive>;
 #endif
     // any datatype not specifed below will be handled by base class
-    typedef array::oarchive<Archive> array_oarchive;
+    typedef detail::common_oarchive<Archive> detail_common_oarchive;
     template<class T>
-    void save_override(const T & t, BOOST_PFTO int){
-        this->array_oarchive::save_override(t, 0);
-    }
-    template<class T>
-    void save_override(T & t, BOOST_PFTO int){
-        this->save_override(const_cast<const T &>(t), 0);
+    void save_override(const T & t, BOOST_PFTO int version){
+      this->detail_common_oarchive::save_override(t, static_cast<int>(version));
     }
+
     // binary files don't include the optional information 
     void save_override(const class_id_optional_type & /* t */, int){}
 
@@ -117,7 +113,7 @@
     init();
 
     basic_binary_oarchive(unsigned int flags) :
-        array_oarchive(flags)
+        detail::common_oarchive<Archive>(flags)
     {}
 };
 

Modified: branches/release/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oprimitive.hpp	(original)
+++ branches/release/boost/archive/basic_binary_oprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -26,9 +26,9 @@
 #include <iosfwd>
 #include <cassert>
 #include <locale>
-#include <cstddef> // size_t
 #include <streambuf> // basic_streambuf
 #include <string>
+#include <cstddef> // size_t
 
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
@@ -71,9 +71,10 @@
     Archive * This(){
         return static_cast<Archive *>(this);
     }
+    #ifndef BOOST_NO_STD_LOCALE
     boost::scoped_ptr<std::locale> archive_locale;
     basic_streambuf_locale_saver<Elem, Tr> locale_saver;
-
+    #endif
     // default saving of primitives.
     template<class T>
     void save(const T & t)
@@ -87,8 +88,7 @@
     // trap usage of invalid uninitialized boolean which would
     // otherwise crash on load.
     void save(const bool t){
-        int i = t;
-        assert(0 == i || 1 == i);
+        assert(0 == static_cast<int>(t) || 1 == static_cast<int>(t));
         save_binary(& t, sizeof(t));
     }
     BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)

Modified: branches/release/boost/archive/basic_streambuf_locale_saver.hpp
==============================================================================
--- branches/release/boost/archive/basic_streambuf_locale_saver.hpp	(original)
+++ branches/release/boost/archive/basic_streambuf_locale_saver.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -25,14 +25,13 @@
 //  See <http://www.boost.org/libs/io/> for the library's home page.
 
 #ifndef BOOST_NO_STD_LOCALE
+
 #include <locale>     // for std::locale
-#endif
 #include <streambuf>  // for std::basic_streambuf
 
 namespace boost{
 namespace archive{
 
-#ifndef BOOST_NO_STD_LOCALE
 template < typename Ch, class Tr >
 class basic_streambuf_locale_saver
 {

Modified: branches/release/boost/archive/basic_text_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_iarchive.hpp	(original)
+++ branches/release/boost/archive/basic_text_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -61,16 +61,6 @@
     {
         this->detail_common_iarchive::load_override(t, 0);
     }
-#if 0
-    // Borland compilers has a problem with strong type.  Try to fix this here
-    #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))
-    void load_override(version_type & t, int){ 
-        unsigned int x;
-        * this->This() >> x;
-        t.t = version_type(x);
-    }
-    #endif
-#endif
     // text file don't include the optional information 
     void load_override(class_id_optional_type & /*t*/, int){}
 

Modified: branches/release/boost/archive/basic_text_iprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_iprimitive.hpp	(original)
+++ branches/release/boost/archive/basic_text_iprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -68,10 +68,14 @@
     IStream &is;
     io::ios_flags_saver flags_saver;
     io::ios_precision_saver precision_saver;
+
+    #ifndef BOOST_NO_STD_LOCALE
     boost::scoped_ptr<std::locale> archive_locale;
     io::basic_ios_locale_saver<
         BOOST_DEDUCED_TYPENAME IStream::char_type, BOOST_DEDUCED_TYPENAME IStream::traits_type
     > locale_saver;
+    #endif
+
     template<class T>
     void load(T & t)
     {

Modified: branches/release/boost/archive/basic_text_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_oarchive.hpp	(original)
+++ branches/release/boost/archive/basic_text_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -38,7 +38,7 @@
 namespace archive {
 
 /////////////////////////////////////////////////////////////////////////
-// class basic_text_iarchive - read serialized objects from a input text stream
+// class basic_text_oarchive 
 template<class Archive>
 class basic_text_oarchive : 
     public detail::common_oarchive<Archive>

Modified: branches/release/boost/archive/basic_text_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_oprimitive.hpp	(original)
+++ branches/release/boost/archive/basic_text_oprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -26,9 +26,9 @@
 
 #include <iomanip>
 #include <locale>
-#include <cstddef> // size_t
 #include <cmath> // isnan
 #include <cassert>
+#include <cstddef> // size_t
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
@@ -71,10 +71,13 @@
     OStream &os;
     io::ios_flags_saver flags_saver;
     io::ios_precision_saver precision_saver;
+
+    #ifndef BOOST_NO_STD_LOCALE
     boost::scoped_ptr<std::locale> archive_locale;
     io::basic_ios_locale_saver<
         BOOST_DEDUCED_TYPENAME OStream::char_type, BOOST_DEDUCED_TYPENAME OStream::traits_type
     > locale_saver;
+    #endif
 
     // default saving of primitives.
     template<class T>
@@ -89,8 +92,7 @@
     void save(const bool t){
         // trap usage of invalid uninitialized boolean which would
         // otherwise crash on load.
-        int i = t;
-        assert(0 == i || 1 == i);
+        assert(0 == static_cast<int>(t) || 1 == static_cast<int>(t));
         if(os.fail())
             boost::throw_exception(archive_exception(archive_exception::stream_error));
         os << t;

Modified: branches/release/boost/archive/basic_xml_archive.hpp
==============================================================================
--- branches/release/boost/archive/basic_xml_archive.hpp	(original)
+++ branches/release/boost/archive/basic_xml_archive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -24,41 +24,6 @@
 namespace boost { 
 namespace archive {
 
-//////////////////////////////////////////////////////////////////////
-// exceptions thrown by xml archives
-//
-class xml_archive_exception : 
-    public virtual archive_exception
-{
-public:
-    typedef enum {
-        xml_archive_parsing_error,    // see save_register
-        xml_archive_tag_mismatch,
-        xml_archive_tag_name_error
-    } exception_code;
-    xml_archive_exception(exception_code c)
-    {}
-    virtual const char *what( ) const throw( )
-    {
-        const char *msg;
-        switch(code){
-        case xml_archive_parsing_error:
-            msg = "unrecognized XML syntax";
-            break;
-        case xml_archive_tag_mismatch:
-            msg = "XML start/end tag mismatch";
-            break;
-        case xml_archive_tag_name_error:
-            msg = "Invalid XML tag name";
-            break;
-        default:
-            msg = archive_exception::what();
-            break;
-        }
-        return msg;
-    }
-};
-
 // constant strings used in xml i/o
 
 extern 

Modified: branches/release/boost/archive/binary_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/binary_iarchive.hpp	(original)
+++ branches/release/boost/archive/binary_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -88,5 +88,6 @@
 
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::binary_iarchive)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::archive::binary_iarchive)
 
 #endif // BOOST_ARCHIVE_BINARY_IARCHIVE_HPP

Modified: branches/release/boost/archive/binary_iarchive_impl.hpp
==============================================================================
--- branches/release/boost/archive/binary_iarchive_impl.hpp	(original)
+++ branches/release/boost/archive/binary_iarchive_impl.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -42,7 +42,7 @@
     // make this protected so it can be called from a derived archive
     template<class T>
     void load_override(T & t, BOOST_PFTO int){
-        basic_binary_iarchive<Archive>::load_override(t, 0);
+        this->basic_binary_iarchive<Archive>::load_override(t, 0L);
     }
     void init(unsigned int flags){
         if(0 != (flags & no_header))

Modified: branches/release/boost/archive/binary_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/binary_oarchive.hpp	(original)
+++ branches/release/boost/archive/binary_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -50,5 +50,6 @@
 
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::binary_oarchive)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::archive::binary_oarchive)
 
 #endif // BOOST_ARCHIVE_BINARY_OARCHIVE_HPP

Modified: branches/release/boost/archive/binary_oarchive_impl.hpp
==============================================================================
--- branches/release/boost/archive/binary_oarchive_impl.hpp	(original)
+++ branches/release/boost/archive/binary_oarchive_impl.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -42,7 +42,7 @@
     // make this protected so it can be called from a derived archive
     template<class T>
     void save_override(T & t, BOOST_PFTO int){
-        basic_binary_oarchive<Archive>::save_override(t, 0);
+        this->basic_binary_oarchive<Archive>::save_override(t, 0L);
     }
     void init(unsigned int flags) {
         if(0 != (flags & no_header))

Modified: branches/release/boost/archive/codecvt_null.hpp
==============================================================================
--- branches/release/boost/archive/codecvt_null.hpp	(original)
+++ branches/release/boost/archive/codecvt_null.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,26 +17,16 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <locale>
-#include <cstddef>
-
+#include <cstddef> // NULL, size_t
+#include <cwchar>   // for mbstate_t
 #include <boost/config.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 
-namespace std{
-    #if defined(__LIBCOMO__)
-        using ::mbstate_t;
-    #elif defined(__QNXNTO__)
-        //using std::mbstate_t;
-    #elif defined(BOOST_DINKUMWARE_STDLIB) && BOOST_DINKUMWARE_STDLIB == 1
-        using ::mbstate_t;
-    #elif defined(__SGI_STL_PORT)
-    #elif defined(BOOST_NO_STDC_NAMESPACE)
-        using ::codecvt;
-        using ::mbstate_t;
-    #elif defined(BOOST_RWSTD_VER)
-        using ::mbstate_t;
-   #endif
-} // namespace std
+#if defined(BOOST_NO_STDC_NAMESPACE)
+    using ::codecvt;
+    using ::mbstate_t;
+    using ::size_t
+#endif
 
 namespace boost {
 namespace archive {
@@ -59,7 +49,7 @@
 template<>
 class codecvt_null<wchar_t> : public std::codecvt<wchar_t, char, std::mbstate_t>
 {
-    virtual BOOST_ARCHIVE_DECL(std::codecvt_base::result)
+    virtual BOOST_WARCHIVE_DECL(std::codecvt_base::result)
     do_out(
         std::mbstate_t & state,
         const wchar_t * first1,
@@ -69,7 +59,7 @@
         char * last2,
         char * & next2
     ) const;
-    virtual BOOST_ARCHIVE_DECL(std::codecvt_base::result)
+    virtual BOOST_WARCHIVE_DECL(std::codecvt_base::result)
     do_in(
         std::mbstate_t & state,
         const char * first1,

Modified: branches/release/boost/archive/detail/abi_suffix.hpp
==============================================================================
--- branches/release/boost/archive/detail/abi_suffix.hpp	(original)
+++ branches/release/boost/archive/detail/abi_suffix.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,12 +8,12 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#if defined( __BORLANDC__ )
+#pragma nopushoptwarn
+#endif
+
 #ifdef BOOST_MSVC
 #pragma warning(pop)
 #endif
 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
-#if defined( __BORLANDC__ )
-#pragma nopushoptwarn
-#endif
-

Modified: branches/release/boost/archive/detail/archive_pointer_iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/archive_pointer_iserializer.hpp	(original)
+++ branches/release/boost/archive/detail/archive_pointer_iserializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,6 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cassert>
+#include <cstddef> // NULL
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 
@@ -76,8 +77,7 @@
     // type_info.  returns NULL if there is no such instance. This
     // would indicate that the no object of the specified type was loaded
     // any where in the code.
-    static
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL(const basic_pointer_iserializer *)
+    static BOOST_ARCHIVE_OR_WARCHIVE_DECL(const basic_pointer_iserializer *)
     find(
         const boost::serialization::extended_type_info & eti
     );

Modified: branches/release/boost/archive/detail/archive_pointer_oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/archive_pointer_oserializer.hpp	(original)
+++ branches/release/boost/archive/detail/archive_pointer_oserializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -51,8 +51,7 @@
     // type_info.  returns NULL, if there is no such instance. This
     // would indicate that the no object of the specified type was saved
     // any where in the code.
-    static 
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL(const basic_pointer_oserializer *)
+    static BOOST_ARCHIVE_OR_WARCHIVE_DECL(const basic_pointer_oserializer *)
     find(
         const boost::serialization::extended_type_info & eti
     );

Modified: branches/release/boost/archive/detail/auto_link_archive.hpp
==============================================================================
--- branches/release/boost/archive/detail/auto_link_archive.hpp	(original)
+++ branches/release/boost/archive/detail/auto_link_archive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,7 +9,7 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 //  auto_link_archive.hpp
 //
-//  © Copyright Robert Ramey 2004
+//  (c) Copyright Robert Ramey 2004
 //  Use, modification, and distribution is subject to the Boost Software
 //  License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -25,23 +25,24 @@
 
 #include <boost/archive/detail/decl.hpp>
 
-#if !defined(BOOST_ARCHIVE_SOURCE) \
-&& !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SERIALIZATION_NO_LIB)
-
-// Set the name of our library, this will get undef'ed by auto_link.hpp
-// once it's done with it:
-//
-#define BOOST_LIB_NAME boost_serialization
-//
-// If we're importing code from a dll, then tell auto_link.hpp about it:
-//
-#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK)
-#  define BOOST_DYN_LINK
-#endif
-//
-// And include the header that does the work:
-//
-#include <boost/config/auto_link.hpp>
+#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SERIALIZATION_NO_LIB) \
+&&  !defined(BOOST_ARCHIVE_SOURCE) && !defined(BOOST_WARCHIVE_SOURCE)  \
+&&  !defined(BOOST_SERIALIZATION_SOURCE)
+
+    // Set the name of our library, this will get undef'ed by auto_link.hpp
+    // once it's done with it:
+    //
+    #define BOOST_LIB_NAME boost_serialization
+    //
+    // If we're importing code from a dll, then tell auto_link.hpp about it:
+    //
+    #if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK)
+    #  define BOOST_DYN_LINK
+    #endif
+    //
+    // And include the header that does the work:
+    //
+    #include <boost/config/auto_link.hpp>
 #endif  // auto-linking disabled
 
 #endif // ARCHIVE_DETAIL_AUTO_LINK_ARCHIVE_HPP

Modified: branches/release/boost/archive/detail/auto_link_warchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/auto_link_warchive.hpp	(original)
+++ branches/release/boost/archive/detail/auto_link_warchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,7 +9,7 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 //  auto_link_warchive.hpp
 //
-//  © Copyright Robert Ramey 2004
+//  (c) Copyright Robert Ramey 2004
 //  Use, modification, and distribution is subject to the Boost Software
 //  License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/boost/archive/detail/basic_config.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_config.hpp	(original)
+++ branches/release/boost/archive/detail/basic_config.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,7 +8,7 @@
 
 //  basic_config.hpp  ---------------------------------------------//
 
-//  © Copyright Robert Ramey 2004
+//  (c) Copyright Robert Ramey 2004
 //  Use, modification, and distribution is subject to the Boost Software
 //  License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/boost/archive/detail/basic_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_iarchive.hpp	(original)
+++ branches/release/boost/archive/detail/basic_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -20,15 +20,13 @@
 // #include <boost/scoped_ptr.hpp>
 
 #include <boost/config.hpp>
-#include <boost/archive/basic_archive.hpp>
+#include <boost/type_traits/broken_compiler_spec.hpp>
 #include <boost/serialization/tracking_enum.hpp>
-
+#include <boost/archive/basic_archive.hpp>
+#include <boost/archive/detail/decl.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost {
-template<class T>
-class shared_ptr;
-
 namespace serialization {
     class extended_type_info;
 } // namespace serialization
@@ -66,17 +64,19 @@
     // note: NOT part of the public API.
     void next_object_pointer(void *t);
     void register_basic_serializer(
-        const basic_iserializer & bis
+        const /* BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) */ basic_iserializer & bis
     );
     void load_object(
         void *t, 
-        const basic_iserializer & bis
+        const /* BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) */ basic_iserializer & bis
     );
-    const basic_pointer_iserializer * 
+    const /* BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) */ basic_pointer_iserializer * 
     load_pointer(
         void * & t, 
-        const basic_pointer_iserializer * bpis_ptr,
-        const basic_pointer_iserializer * (*finder)(
+        const /* BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) */
+            basic_pointer_iserializer * bpis_ptr,
+        const /* BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) */
+        basic_pointer_iserializer * (*finder)(
             const boost::serialization::extended_type_info & eti
         )
     );
@@ -99,9 +99,9 @@
 
 // required by smart_cast for compilers not implementing 
 // partial template specialization
-BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(
-    boost::archive::detail::basic_iarchive
-)
+BOOST_TT_BROKEN_COMPILER_SPEC(
+    boost::archive::detail::basic_iarchive  
+) 
 
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 

Modified: branches/release/boost/archive/detail/basic_iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_iserializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_iserializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -16,13 +16,12 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <cassert>
 #include <cstdlib> // NULL
 #include <boost/config.hpp>
 
-#include <boost/archive/detail/auto_link_archive.hpp>
+#include <boost/archive/detail/decl.hpp>
 #include <boost/archive/detail/basic_serializer.hpp>
-
+#include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost {
@@ -42,10 +41,10 @@
     public basic_serializer
 {
 private:
-    basic_pointer_iserializer *bpis;
+    basic_pointer_iserializer *m_bpis;
 protected:
     explicit basic_iserializer(
-        const boost::serialization::extended_type_info & type_
+        const boost::serialization::extended_type_info & type
     );
     // account for bogus gcc warning
     #if defined(__GNUC__)
@@ -54,13 +53,13 @@
     ~basic_iserializer();
 public:
     bool serialized_as_pointer() const {
-        return bpis != NULL;
+        return m_bpis != NULL;
     }
-    void set_bpis(basic_pointer_iserializer *bpis_){
-        bpis = bpis_;
+    void set_bpis(basic_pointer_iserializer *bpis){
+        m_bpis = bpis;
     }
     const basic_pointer_iserializer * get_bpis_ptr() const {
-        return bpis;
+        return m_bpis;
     }
     virtual void load_object_data(
         basic_iarchive & ar, 

Modified: branches/release/boost/archive/detail/basic_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_oarchive.hpp	(original)
+++ branches/release/boost/archive/detail/basic_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,7 +17,8 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <cstddef> // NULL
+#include <boost/type_traits/broken_compiler_spec.hpp>
 
 // can't use this - much as I'd like to as borland doesn't support it
 // #include <boost/scoped_ptr.hpp>
@@ -28,9 +29,6 @@
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost {
-template<class T>
-class shared_ptr;
-
 namespace serialization {
     class extended_type_info;
 } // namespace serialization
@@ -96,7 +94,7 @@
 
 // required by smart_cast for compilers not implementing 
 // partial template specialization
-BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(
+BOOST_TT_BROKEN_COMPILER_SPEC(
     boost::archive::detail::basic_oarchive
 )
 

Modified: branches/release/boost/archive/detail/basic_oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_oserializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_oserializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -16,7 +16,7 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <cstdlib> // NULL
+#include <cstddef> // NULL
 #include <boost/config.hpp>
 
 #include <boost/archive/detail/auto_link_archive.hpp>
@@ -41,7 +41,7 @@
     public basic_serializer
 {
 private:
-    basic_pointer_oserializer *bpos;
+    basic_pointer_oserializer *m_bpos;
 protected:
     explicit basic_oserializer(
         const boost::serialization::extended_type_info & type_
@@ -53,13 +53,13 @@
     ~basic_oserializer();
 public:
     bool serialized_as_pointer() const {
-        return bpos != NULL;
+        return m_bpos != NULL;
     }
-    void set_bpos(basic_pointer_oserializer *bpos_){
-        bpos = bpos_;
+    void set_bpos(basic_pointer_oserializer *bpos){
+        m_bpos = bpos;
     }
     const basic_pointer_oserializer * get_bpos() const {
-        return bpos;
+        return m_bpos;
     }
     virtual void save_object_data(
         basic_oarchive & ar, const void * x

Modified: branches/release/boost/archive/detail/basic_pointer_iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_pointer_iserializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_pointer_iserializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,5 +1,5 @@
-#ifndef BOOST_ARCHIVE_BASIC_ARCHIVE_POINTER_ISERIALIZER_HPP
-#define BOOST_ARCHIVE_BASIC_ARCHIVE_POINTER_ISERIALIZER_HPP
+#ifndef BOOST_ARCHIVE_BASIC_POINTER_ISERIALIZER_HPP
+#define BOOST_ARCHIVE_BASIC_POINTER_ISERIALIZER_HPP
 
 // MS compatible compilers support #pragma once
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
@@ -61,4 +61,4 @@
 
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
-#endif // BOOST_ARCHIVE_BASIC_ARCHIVE_POINTER_ISERIALIZER_HPP
+#endif // BOOST_ARCHIVE_BASIC_POINTER_ISERIALIZER_HPP

Modified: branches/release/boost/archive/detail/basic_pointer_oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_pointer_oserializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_pointer_oserializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,5 +1,5 @@
-#ifndef BOOST_ARCHIVE_BASIC_ARCHIVE_POINTER_OSERIALIZER_HPP
-#define BOOST_ARCHIVE_BASIC_ARCHIVE_POINTER_OSERIALIZER_HPP
+#ifndef BOOST_ARCHIVE_BASIC_POINTER_OSERIALIZER_HPP
+#define BOOST_ARCHIVE_BASIC_POINTER_OSERIALIZER_HPP
 
 // MS compatible compilers support #pragma once
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
@@ -40,12 +40,12 @@
     explicit basic_pointer_oserializer(
         const boost::serialization::extended_type_info & type_
     );
+public:
     // account for bogus gcc warning
     #if defined(__GNUC__)
     virtual
     #endif
     ~basic_pointer_oserializer();
-public:
     virtual const basic_oserializer & get_basic_serializer() const = 0;
     virtual void save_object_ptr(
         basic_oarchive & ar,
@@ -59,4 +59,4 @@
 
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
-#endif // BOOST_ARCHIVE_BASIC_ARCHIVE_POINTER_OSERIALIZER_HPP
+#endif // BOOST_ARCHIVE_BASIC_POINTER_OSERIALIZER_HPP

Modified: branches/release/boost/archive/detail/basic_serializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_serializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_serializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,6 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cassert>
+#include <cstddef> // NULL
 
 #include <boost/noncopyable.hpp>
 #include <boost/config.hpp>
@@ -34,14 +35,25 @@
         const boost::serialization::extended_type_info & eti
     ) : 
         m_eti(eti)
-    {}
+    {
+        assert(NULL != & eti);
+    }
 public:
     const boost::serialization::extended_type_info & get_eti() const {
         return m_eti;
     }
-    bool operator<(const basic_serializer & rhs) const {
-        return & m_eti < & rhs.get_eti();
-    }
+};
+
+inline bool 
+operator<(const basic_serializer & lhs, const basic_serializer & rhs)  {
+  return & lhs.get_eti() < & rhs.get_eti();
+}
+
+class basic_serializer_arg : public basic_serializer {
+public:
+    basic_serializer_arg(const serialization::extended_type_info & eti) :
+        basic_serializer(eti)
+    {}
 };
 
 } // namespace detail

Modified: branches/release/boost/archive/detail/basic_serializer_map.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_serializer_map.hpp	(original)
+++ branches/release/boost/archive/detail/basic_serializer_map.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -34,32 +34,22 @@
 
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_serializer;
 
+bool operator<(const basic_serializer & lhs, const basic_serializer & rhs);
+
 struct BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) type_info_pointer_compare
 {
     bool operator()(
         const basic_serializer * lhs, const basic_serializer * rhs
-    ) const ;
-};
-
-class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_serializer_map : public
-    boost::noncopyable
-{
-    typedef std::set<const basic_serializer *, type_info_pointer_compare> map_type;
-    map_type m_map;
-    bool & m_deleted;
-public:
-    bool insert(const basic_serializer * bs);
-    const basic_serializer * tfind(
-        const boost::serialization::extended_type_info & type_
-    ) const;
-    void erase(basic_serializer * bs);
-    basic_serializer_map(bool & deleted);
-    ~basic_serializer_map();
-private:
-    // cw 8.3 requires this
-    basic_serializer_map& operator=(basic_serializer_map const&);
+    ) const {
+        return *lhs < *rhs;
+    }
 };
 
+typedef BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) std::set<
+    const basic_serializer *, 
+    type_info_pointer_compare
+> basic_serializer_map;
+ 
 } // namespace detail
 } // namespace archive
 } // namespace boost

Modified: branches/release/boost/archive/detail/common_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/common_iarchive.hpp	(original)
+++ branches/release/boost/archive/detail/common_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -60,8 +60,8 @@
     }
     // default implementations of functions which emit start/end tags for
     // archive types that require them.
-    void load_start(const char *name){}
-    void load_end(const char *name){}
+    void load_start(const char * /*name*/){}
+    void load_end(const char * /*name*/){}
     // default archive initialization
     common_iarchive(unsigned int flags = 0) : 
         basic_iarchive(flags),

Modified: branches/release/boost/archive/detail/common_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/common_oarchive.hpp	(original)
+++ branches/release/boost/archive/detail/common_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -63,8 +63,8 @@
     void save_override(T & t, BOOST_PFTO int){
         archive::save(* this->This(), t);
     }
-    void save_start(const char *name){}
-    void save_end(const char *name){}
+    void save_start(const char * /*name*/){}
+    void save_end(const char * /*name*/){}
     common_oarchive(unsigned int flags = 0) : 
         basic_oarchive(flags),
         interface_oarchive<Archive>()

Modified: branches/release/boost/archive/detail/decl.hpp
==============================================================================
--- branches/release/boost/archive/detail/decl.hpp	(original)
+++ branches/release/boost/archive/detail/decl.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,7 +9,7 @@
 /////////1/////////2///////// 3/////////4/////////5/////////6/////////7/////////8
 //  decl.hpp
 //
-//  © Copyright Robert Ramey 2004
+//  (c) Copyright Robert Ramey 2004
 //  Use, modification, and distribution is subject to the Boost Software
 //  License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)

Deleted: branches/release/boost/archive/detail/dynamically_initialized.hpp
==============================================================================
--- branches/release/boost/archive/detail/dynamically_initialized.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
+++ (empty file)
@@ -1,45 +0,0 @@
-// Copyright David Abrahams 2006. Distributed under the Boost
-// Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_ARCHIVE_DETAIL_DYNAMICALLY_INITIALIZED_DWA2006524_HPP
-# define BOOST_ARCHIVE_DETAIL_DYNAMICALLY_INITIALIZED_DWA2006524_HPP
-
-# include <boost/serialization/force_include.hpp>
-
-namespace boost { namespace archive { namespace detail { 
-
-//
-// Provides a dynamically-initialized (singleton) instance of T in a
-// way that avoids LNK1179 on vc6.  See http://tinyurl.com/ljdp8 or
-// http://lists.boost.org/Archives/boost/2006/05/105286.php for
-// details.
-//
-template <class T>
-struct dynamically_initialized
-{
-protected:
-    static T& instance;
-private:
-    static T& get_instance();
-#if defined(__GNUC__)
-  // Workaround "warning: all member functions in class `
-  // boost::archive::detail::dynamically_initialized<T>' are private"
- public:
-  void work_around_gcc_warning();
-#endif
-};
-
-template <class T>
-T& dynamically_initialized<T>::instance
-  = dynamically_initialized<T>::get_instance();
-
-template <class T>
-T& dynamically_initialized<T>::get_instance()
-{
-    static T instance_;
-    return instance_;
-}
-
-}}} // namespace boost::archive::detail
-
-#endif // BOOST_ARCHIVE_DETAIL_DYNAMICALLY_INITIALIZED_DWA2006524_HPP

Modified: branches/release/boost/archive/detail/interface_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/interface_iarchive.hpp	(original)
+++ branches/release/boost/archive/detail/interface_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -16,19 +16,15 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 #include <string>
+#include <cstddef> // NULL
 #include <boost/cstdint.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/iserializer.hpp>
+#include <boost/serialization/singleton.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost {
-template<class T>
-class shared_ptr;
-namespace serialization {
-    class extended_type_info;
-} // namespace serialization
-
 namespace archive {
 namespace detail {
 
@@ -54,7 +50,9 @@
     const basic_pointer_iserializer * 
     register_type(T * = NULL){
         const basic_pointer_iserializer & bpis =
-            pointer_iserializer<Archive, T>::get_instance();
+            boost::serialization::singleton<
+                pointer_iserializer<Archive, T> 
+            >::get_const_instance();
         this->This()->register_basic_serializer(bpis.get_basic_serializer());
         return & bpis;
     }

Modified: branches/release/boost/archive/detail/interface_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/interface_oarchive.hpp	(original)
+++ branches/release/boost/archive/detail/interface_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -16,6 +16,7 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 #include <string>
+#include <cstddef> // NULL
 #include <boost/cstdint.hpp>
 #include <boost/mpl/bool.hpp>
 
@@ -23,12 +24,9 @@
 #include <boost/archive/detail/oserializer.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-namespace boost { 
-template<class T>
-class shared_ptr;
-namespace serialization {
-    class extended_type_info;
-} // namespace serialization
+#include <boost/serialization/singleton.hpp>
+
+namespace boost {
 namespace archive {
 namespace detail {
 
@@ -54,7 +52,9 @@
     const basic_pointer_oserializer * 
     register_type(const T * = NULL){
         const basic_pointer_oserializer & bpos =
-            pointer_oserializer<Archive, T>::get_instance();
+            boost::serialization::singleton<
+                pointer_oserializer<Archive, T>
+            >::get_const_instance();
         this->This()->register_basic_serializer(bpos.get_basic_serializer());
         return & bpos;
     }

Modified: branches/release/boost/archive/detail/iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/iserializer.hpp	(original)
+++ branches/release/boost/archive/detail/iserializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -24,7 +24,7 @@
 
 #include <new>     // for placement new
 #include <memory>  // for auto_ptr
-#include <cstddef> // size_t
+#include <cstddef> // size_t, NULL
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
@@ -40,12 +40,12 @@
 #include <boost/detail/no_exceptions_support.hpp>
 
 #include <boost/type_traits/is_pointer.hpp>
-#include <boost/type_traits/is_fundamental.hpp>
 #include <boost/type_traits/is_enum.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_const.hpp>
-#include <boost/type_traits/remove_all_extents.hpp>
-#include <boost/serialization/is_abstract.hpp>
+#include <boost/type_traits/remove_extent.hpp>
+#include <boost/serialization/assume_abstract.hpp>
+#include <boost/type_traits/is_polymorphic.hpp>
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/if.hpp>
@@ -67,9 +67,8 @@
 #include <boost/archive/detail/basic_iarchive.hpp>
 #include <boost/archive/detail/basic_iserializer.hpp>
 #include <boost/archive/detail/archive_pointer_iserializer.hpp>
-#include <boost/archive/detail/dynamically_initialized.hpp>
+#include <boost/archive/archive_exception.hpp>
 
-#include <boost/serialization/force_include.hpp>
 #include <boost/serialization/serialization.hpp>
 #include <boost/serialization/version.hpp>
 #include <boost/serialization/level.hpp>
@@ -79,6 +78,8 @@
 #include <boost/serialization/void_cast.hpp>
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/collection_size_type.hpp>
+#include <boost/serialization/singleton.hpp>
+
 namespace boost {
 
 namespace serialization {
@@ -108,43 +109,34 @@
     }
     // private constructor to inhibit any existence other than the 
     // static one
+public:
     explicit iserializer() :
         basic_iserializer(
-            * boost::serialization::type_info_implementation<T>::type::get_instance()
+            boost::serialization::type_info_implementation<T>::type
+                ::get_const_instance()
         )
     {}
-public:
     virtual BOOST_DLLEXPORT void load_object_data(
         basic_iarchive & ar,
         void *x, 
         const unsigned int file_version
-    ) const BOOST_USED ;
+    ) const BOOST_USED;
     virtual bool class_info() const {
         return boost::serialization::implementation_level<T>::value 
             >= boost::serialization::object_class_info;
     }
     virtual bool tracking(const unsigned int /* flags */) const {
-//        if(0 != (flags & no_tracking))
-//            return false;
         return boost::serialization::tracking_level<T>::value 
                 == boost::serialization::track_always
-            || boost::serialization::tracking_level<T>::value 
+            || ( boost::serialization::tracking_level<T>::value 
                 == boost::serialization::track_selectively
-            && serialized_as_pointer();
+                && serialized_as_pointer());
     }
     virtual unsigned int version() const {
         return ::boost::serialization::version<T>::value;
     }
     virtual bool is_polymorphic() const {
-        typedef BOOST_DEDUCED_TYPENAME 
-            boost::serialization::type_info_implementation<
-                T
-            >::type::is_polymorphic::type typex;
-        return typex::value;
-    }
-    static iserializer & get_instance(){
-        static iserializer instance;
-        return instance;
+        return boost::is_polymorphic<T>::value;
     }
     virtual ~iserializer(){};
 };
@@ -167,32 +159,20 @@
 template<class Archive, class T>
 class pointer_iserializer
   : public archive_pointer_iserializer<Archive>
-  , public dynamically_initialized<pointer_iserializer<Archive,T> >
 {
 private:
     virtual const basic_iserializer & get_basic_serializer() const {
-        return iserializer<Archive, T>::get_instance();
+        return boost::serialization::singleton<
+            iserializer<Archive, T>
+        >::get_const_instance();
     }
-    virtual BOOST_DLLEXPORT void load_object_ptr(
+    BOOST_DLLEXPORT virtual void load_object_ptr(
         basic_iarchive & ar, 
         void * & x,
         const unsigned int file_version
     ) const BOOST_USED;
-#if defined(__GNUC__) || ( defined(BOOST_MSVC) && (_MSC_VER <= 1300) )
 public:
-#endif
-    // private constructor to inhibit any existence other than the 
-    // static one.  Note GCC doesn't permit constructor to be private
-    BOOST_DLLEXPORT pointer_iserializer() BOOST_USED;
-    friend struct dynamically_initialized<pointer_iserializer<Archive,T> >;
-public:
-    // at least one compiler (CW) seems to require that serialize_adl
-    // be explicitly instantiated. Still under investigation. 
-    #if !defined(__BORLANDC__)
-    void (* const m)(Archive &, T &, const unsigned);
-    boost::serialization::extended_type_info * (* e)();
-    #endif
-    BOOST_DLLEXPORT static const pointer_iserializer & get_instance() BOOST_USED;
+    pointer_iserializer();
 };
 
 // note trick to be sure that operator new is using class specific
@@ -305,29 +285,15 @@
 }
 
 template<class Archive, class T>
-#if !defined(__BORLANDC__)
-BOOST_DLLEXPORT pointer_iserializer<Archive, T>::pointer_iserializer() :
-    archive_pointer_iserializer<Archive>(
-        * boost::serialization::type_info_implementation<T>::type::get_instance()
-    ),
-    m(boost::serialization::serialize_adl<Archive, T>),
-    e(boost::serialization::type_info_implementation<T>::type::get_instance)
-#else
-BOOST_DLLEXPORT pointer_iserializer<Archive, T>::pointer_iserializer() :
+pointer_iserializer<Archive, T>::pointer_iserializer() :
     archive_pointer_iserializer<Archive>(
-        * boost::serialization::type_info_implementation<T>::type::get_instance()
+        boost::serialization::type_info_implementation<T>::type
+            ::get_const_instance()
     )
-#endif
 {
-    iserializer<Archive, T> & bis = iserializer<Archive, T>::get_instance();
-    bis.set_bpis(this);
-}
-
-template<class Archive, class T>
-BOOST_DLLEXPORT const pointer_iserializer<Archive, T> &
-pointer_iserializer<Archive, T>::get_instance() {
-    // note: comeau complains without full qualification
-    return dynamically_initialized<pointer_iserializer<Archive,T> >::instance;
+    boost::serialization::singleton<
+        iserializer<Archive, T>
+    >::get_mutable_instance().set_bpis(this);
 }
 
 template<class Archive, class T>
@@ -361,7 +327,12 @@
             // its not called that way - so fix it her
             typedef BOOST_DEDUCED_TYPENAME boost::remove_const<T>::type typex;
             void * x = & const_cast<typex &>(t);
-            ar.load_object(x, iserializer<Archive, T>::get_instance());
+            ar.load_object(
+                x, 
+                boost::serialization::singleton<
+                    iserializer<Archive, T>
+                >::get_const_instance()
+            );
         }
     };
 
@@ -405,6 +376,11 @@
     > > >::type typex;
 
     static void invoke(Archive & ar, T &t){
+        // check that we're not trying to serialize something that
+        // has been marked not to be serialized.  If this your program
+        // traps here, you've tried to serialize a class whose trait
+        // has been marked "non-serializable". Either reset the trait
+        // (see level.hpp) or change program not to serialize items of this class
         BOOST_STATIC_ASSERT((
             mpl::greater_equal<
                 boost::serialization::implementation_level<T>, 
@@ -421,12 +397,8 @@
     struct abstract
     {
         static const basic_pointer_iserializer * register_type(Archive & /* ar */){
-            #if ! defined(__BORLANDC__)
-            typedef BOOST_DEDUCED_TYPENAME 
-                boost::serialization::type_info_implementation<T>::type::is_polymorphic typex;
             // it has? to be polymorphic
-            BOOST_STATIC_ASSERT(typex::value);
-            #endif
+            BOOST_STATIC_ASSERT(boost::is_polymorphic<T>::value);
             return static_cast<basic_pointer_iserializer *>(NULL);
          }
     };
@@ -447,7 +419,7 @@
         // virtual serialize functions used for plug-ins
         typedef BOOST_DEDUCED_TYPENAME
             mpl::eval_if<
-                serialization::is_abstract<T>,
+                boost::serialization::is_abstract<const T>,
                 mpl::identity<abstract<T> >,
                 mpl::identity<non_abstract<T> >    
             >::type typex;
@@ -464,7 +436,8 @@
         return static_cast<T *>(
             boost::serialization::void_upcast(
                 eti,
-                * boost::serialization::type_info_implementation<T>::type::get_instance(),
+                boost::serialization::type_info_implementation<T>::type
+                    ::get_const_instance(),
                 t
             )
         );
@@ -497,7 +470,7 @@
 template<class Archive, class T>
 struct load_array_type {
     static void invoke(Archive &ar, T &t){
-        typedef typename remove_all_extents<T>::type value_type;
+        typedef BOOST_DEDUCED_TYPENAME remove_extent<T>::type value_type;
         
         // convert integers to correct enum to load
         int current_count = sizeof(t) / (
@@ -514,27 +487,6 @@
     }
 };
 
-#if 0
-// note bogus arguments to workaround msvc 6 silent runtime failure
-template<class Archive, class T>
-BOOST_DLLEXPORT 
-inline const basic_pointer_iserializer &
-instantiate_pointer_iserializer(
-    Archive * /* ar = NULL */,
-    T * /* t = NULL */
-) BOOST_USED;
-
-template<class Archive, class T>
-BOOST_DLLEXPORT 
-inline const basic_pointer_iserializer &
-instantiate_pointer_iserializer(
-    Archive * /* ar = NULL */,
-    T * /* t = NULL */
-){
-    return pointer_iserializer<Archive,T>::instance;
-}
-#endif
-
 } // detail
 
 template<class Archive, class T>
@@ -572,7 +524,7 @@
 // for loading const objects - but I see no alternative
 template<class Archive, class T>
 inline void load(Archive &ar, const T & t){
-        load(ar, const_cast<T &>(t));
+    load(ar, const_cast<T &>(t));
 }
 #endif
 
@@ -580,7 +532,7 @@
 #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 template<class Archive, class T>
 inline void load_wrapper(Archive &ar, const T&t, mpl::true_){
-  boost::archive::load(ar, const_cast<T&>(t));
+    boost::archive::load(ar, const_cast<T&>(t));
 }
 
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x560))

Modified: branches/release/boost/archive/detail/oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/oserializer.hpp	(original)
+++ branches/release/boost/archive/detail/oserializer.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -23,6 +23,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cassert>
+#include <cstddef> // NULL
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
@@ -32,23 +33,23 @@
 #include <boost/static_warning.hpp>
 
 #include <boost/type_traits/is_pointer.hpp>
-#include <boost/type_traits/is_fundamental.hpp>
 #include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_volatile.hpp>
+//#include <boost/type_traits/is_volatile.hpp>
 #include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_all_extents.hpp>
-#include <boost/serialization/is_abstract.hpp>
+//#include <boost/type_traits/is_same.hpp>
+#include <boost/type_traits/is_polymorphic.hpp>
+#include <boost/type_traits/remove_extent.hpp>
+#include <boost/serialization/assume_abstract.hpp>
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/and.hpp>
-#include <boost/mpl/less.hpp>
+//#include <boost/mpl/less.hpp>
 #include <boost/mpl/greater_equal.hpp>
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/mpl/list.hpp>
-#include <boost/mpl/empty.hpp>
+//#include <boost/mpl/list.hpp>
+//#include <boost/mpl/empty.hpp>
 #include <boost/mpl/not.hpp>
 
  #ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO   
@@ -58,9 +59,7 @@
 #include <boost/archive/detail/basic_oarchive.hpp>
 #include <boost/archive/detail/basic_oserializer.hpp>
 #include <boost/archive/detail/archive_pointer_oserializer.hpp>
-#include <boost/archive/detail/dynamically_initialized.hpp>
 
-#include <boost/serialization/force_include.hpp>
 #include <boost/serialization/serialization.hpp>
 #include <boost/serialization/version.hpp>
 #include <boost/serialization/level.hpp>
@@ -70,6 +69,7 @@
 #include <boost/serialization/void_cast.hpp>
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/collection_size_type.hpp>
+#include <boost/serialization/singleton.hpp>
 
 #include <boost/archive/archive_exception.hpp>
 
@@ -104,39 +104,31 @@
 private:
     // private constructor to inhibit any existence other than the 
     // static one
+public:
     explicit BOOST_DLLEXPORT oserializer() :
         basic_oserializer(
-            * boost::serialization::type_info_implementation<T>::type::get_instance()
+            boost::serialization::type_info_implementation<T>::type
+                ::get_const_instance()
         )
     {}
-public:
     virtual BOOST_DLLEXPORT void save_object_data(
         basic_oarchive & ar,    
         const void *x
-    ) const BOOST_USED ;
+    ) const BOOST_USED;
     virtual bool class_info() const {
         return boost::serialization::implementation_level<T>::value 
             >= boost::serialization::object_class_info;
     }
     virtual bool tracking(const unsigned int /* flags */) const {
-//        if(0 != (flags &  no_tracking))
-//            return false;
         return boost::serialization::tracking_level<T>::value == boost::serialization::track_always
-            || boost::serialization::tracking_level<T>::value == boost::serialization::track_selectively
-            && serialized_as_pointer();
+            || (boost::serialization::tracking_level<T>::value == boost::serialization::track_selectively
+                && serialized_as_pointer());
     }
     virtual unsigned int version() const {
         return ::boost::serialization::version<T>::value;
     }
     virtual bool is_polymorphic() const {
-        typedef BOOST_DEDUCED_TYPENAME boost::serialization::type_info_implementation<
-            T
-        >::type::is_polymorphic::type typex;
-        return typex::value;
-    }
-    static oserializer & get_instance(){
-        static oserializer instance;
-        return instance;
+        return boost::is_polymorphic<T>::value;
     }
     virtual ~oserializer(){}
 };
@@ -148,6 +140,7 @@
 ) const {
     // make sure call is routed through the highest interface that might
     // be specialized by the user.
+    BOOST_STATIC_ASSERT(boost::is_const<T>::value == false);
     boost::serialization::serialize_adl(
         boost::smart_cast_reference<Archive &>(ar),
         * static_cast<T *>(const_cast<void *>(x)),
@@ -158,34 +151,26 @@
 template<class Archive, class T>
 class pointer_oserializer
   : public archive_pointer_oserializer<Archive>
-  , public dynamically_initialized<pointer_oserializer<Archive,T> >
 {
+    const basic_oserializer & get_basic_serializer() const;
 private:
-    virtual const basic_oserializer & get_basic_serializer() const {
-        return oserializer<Archive, T>::get_instance();
-    }
     virtual BOOST_DLLEXPORT void save_object_ptr(
         basic_oarchive & ar,
         const void * x
-    ) const BOOST_USED ;
-#if defined(__GNUC__) || ( defined(BOOST_MSVC) && (_MSC_VER <= 1300) )
+    ) const BOOST_USED;
 public:
-#endif
-    // private constructor to inhibit any existence other than the 
-    // static one.  Note GCC doesn't permit constructor to be private
     explicit BOOST_DLLEXPORT pointer_oserializer() BOOST_USED;
-    friend struct dynamically_initialized<pointer_oserializer<Archive,T> >;
-public:
-    #if !defined(__BORLANDC__)
-    // at least one compiler (CW) seems to require that serialize_adl
-    // be explicitly instantiated. Still under investigation. 
-    void (* const m)(Archive &, T &, const unsigned);
-    boost::serialization::extended_type_info * (* e)();
-    #endif
-    BOOST_DLLEXPORT static const pointer_oserializer & get_instance() BOOST_USED;
 };
 
 template<class Archive, class T>
+const basic_oserializer & 
+pointer_oserializer<Archive, T>::get_basic_serializer() const {
+    return boost::serialization::singleton<
+        oserializer<Archive, T>
+    >::get_const_instance();
+}
+
+template<class Archive, class T>
 BOOST_DLLEXPORT void pointer_oserializer<Archive, T>::save_object_ptr(
     basic_oarchive & ar,
     const void * x
@@ -205,30 +190,16 @@
 }
 
 template<class Archive, class T>
-#if !defined(__BORLANDC__)
 BOOST_DLLEXPORT pointer_oserializer<Archive, T>::pointer_oserializer() :
     archive_pointer_oserializer<Archive>(
-        * boost::serialization::type_info_implementation<T>::type::get_instance()
-    ),
-    m(boost::serialization::serialize_adl<Archive, T>),
-    e(boost::serialization::type_info_implementation<T>::type::get_instance)
-#else
-BOOST_DLLEXPORT pointer_oserializer<Archive, T>::pointer_oserializer() :
-    archive_pointer_oserializer<Archive>(
-        * boost::serialization::type_info_implementation<T>::type::get_instance()
+        boost::serialization::type_info_implementation<T>::type
+            ::get_const_instance()
     )
-#endif
 {
     // make sure appropriate member function is instantiated
-    oserializer<Archive, T> & bos = oserializer<Archive, T>::get_instance();
-    bos.set_bpos(this);
-}
-
-template<class Archive, class T>
-BOOST_DLLEXPORT const pointer_oserializer<Archive, T> &
-pointer_oserializer<Archive, T>::get_instance() {
-    // note: comeau complains without full qualification
-    return dynamically_initialized<pointer_oserializer<Archive,T> >::instance;
+    boost::serialization::singleton<
+        oserializer<Archive, T> 
+    >::get_mutable_instance().set_bpos(this);
 }
 
 template<class Archive, class T>
@@ -256,7 +227,12 @@
     // serialization level and class version
     struct save_standard {
         static void invoke(Archive &ar, const T & t){
-            ar.save_object(& t, oserializer<Archive, T>::get_instance());
+            ar.save_object(
+                & t, 
+                boost::serialization::singleton<
+                    oserializer<Archive, T>
+                >::get_const_instance()
+            );
         }
     };
 
@@ -300,7 +276,7 @@
         // else
             // do a fast save only tracking is turned off
             mpl::identity<save_conditional>
-    > > >::type typex; 
+        > > >::type typex; 
 
     static void invoke(Archive & ar, const T & t){
         // check that we're not trying to serialize something that
@@ -325,10 +301,8 @@
     {
         static const basic_pointer_oserializer * register_type(Archive & /* ar */){
             // it has? to be polymorphic
-            BOOST_STATIC_ASSERT(
-                boost::serialization::type_info_implementation<T>::type::is_polymorphic::value
-            );
-            return static_cast<const basic_pointer_oserializer *>(NULL);
+            BOOST_STATIC_ASSERT(boost::is_polymorphic<T>::value);
+            return NULL;
         }
     };
 
@@ -348,7 +322,7 @@
         // virtual serialize functions used for plug-ins
         typedef 
             BOOST_DEDUCED_TYPENAME mpl::eval_if<
-                serialization::is_abstract<T>,
+                boost::serialization::is_abstract<T>,
                 mpl::identity<abstract<T> >,
                 mpl::identity<non_abstract<T> >       
             >::type typex;
@@ -360,11 +334,14 @@
     {
         static void save(
             Archive &ar, 
-            const T & t, 
-            const basic_pointer_oserializer * bpos_ptr
+            T & t
         ){
+            const basic_pointer_oserializer & bpos = 
+                boost::serialization::singleton<
+                    pointer_oserializer<Archive, T>
+                >::get_const_instance();
             // save the requested pointer type
-            ar.save_pointer(& t, bpos_ptr);
+            ar.save_pointer(& t, & bpos);
         }
     };
 
@@ -373,18 +350,24 @@
     {
         static void save(
             Archive &ar, 
-            const T & t, 
-            const basic_pointer_oserializer * bpos_ptr
+            T & t
         ){
-            const boost::serialization::extended_type_info * this_type
-                = boost::serialization::type_info_implementation<T>::type::get_instance();
+            BOOST_DEDUCED_TYPENAME 
+            boost::serialization::type_info_implementation<T>::type 
+                const & i = boost::serialization::type_info_implementation<T>::type
+                    ::get_const_instance();
+
+            boost::serialization::extended_type_info const * const this_type = & i;
+
             // retrieve the true type of the object pointed to
             // if this assertion fails its an error in this library
             assert(NULL != this_type);
-            const boost::serialization::extended_type_info * true_type 
-                = boost::serialization::type_info_implementation<T>::type::get_derived_extended_type_info(t);
+
+            const boost::serialization::extended_type_info * true_type =
+                i.get_derived_extended_type_info(t);
+
             // note:if this exception is thrown, be sure that derived pointer
-            // is either regsitered or exported.
+            // is either registered or exported.
             if(NULL == true_type){
                 boost::throw_exception(
                     archive_exception(archive_exception::unregistered_class)
@@ -394,7 +377,8 @@
             // if its not a pointer to a more derived type
             const void *vp = static_cast<const void *>(&t);
             if(*this_type == *true_type){
-                ar.save_pointer(vp, bpos_ptr);
+                const basic_pointer_oserializer * bpos = register_type(ar, t);
+                ar.save_pointer(vp, bpos);
                 return;
             }
             // convert pointer to more derived type. if this is thrown
@@ -406,32 +390,37 @@
                 );
             }
 
-            // sice true_type is valid, and this only gets made if the 
+            // since true_type is valid, and this only gets made if the 
             // pointer oserializer object has been created, this should never
             // fail
-            bpos_ptr = archive_pointer_oserializer<Archive>::find(* true_type);
-            assert(NULL != bpos_ptr);
-            if(NULL == bpos_ptr)
+            const basic_pointer_oserializer * bpos 
+                = archive_pointer_oserializer<Archive>::find(* true_type);
+            assert(NULL != bpos);
+            if(NULL == bpos)
                 boost::throw_exception(
                     archive_exception(archive_exception::unregistered_class)
                 );
-            ar.save_pointer(vp, bpos_ptr);
+            ar.save_pointer(vp, bpos);
         }
     };
 
+    // out of line selector works around borland quirk
     template<class T>
-    static void save(
-        Archive & ar, 
-        const T &t,
-        const basic_pointer_oserializer * bpos_ptr
-    ){
+    struct conditional {
         typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
-            BOOST_DEDUCED_TYPENAME boost::serialization::
-                type_info_implementation<T>::type::is_polymorphic,
+            is_polymorphic<T>,
             mpl::identity<polymorphic<T> >,
             mpl::identity<non_polymorphic<T> >
-        >::type typey;
-        typey::save(ar, const_cast<T &>(t), bpos_ptr);
+        >::type type;
+    };
+
+    // used to convert TPtr in to a pointer to a T
+    template<class T>
+    static void save(
+        Archive & ar, 
+        const T & t
+    ){
+        conditional<T>::type::save(ar, const_cast<T &>(t));
     }
 
     template<class T>
@@ -452,14 +441,14 @@
         #else
             // otherwise remove the const
         #endif
-        const basic_pointer_oserializer * bpos_ptr =  register_type(ar, * t);
+        register_type(ar, * t);
         if(NULL == t){
             basic_oarchive & boa = boost::smart_cast_reference<basic_oarchive &>(ar);
             boa.save_null_pointer();
             save_access::end_preamble(ar);
             return;
         }
-        save(ar, * t, bpos_ptr);
+        save(ar, * t);
     };
 };
 
@@ -477,7 +466,7 @@
 struct save_array_type
 {
     static void invoke(Archive &ar, const T &t){
-        typedef typename remove_all_extents<T>::type value_type;
+        typedef BOOST_DEDUCED_TYPENAME boost::remove_extent<T>::type value_type;
         
         save_access::end_preamble(ar);
         // consider alignment
@@ -490,27 +479,6 @@
     }
 };
 
-
-#if 0
-// note bogus arguments to workaround msvc 6 silent runtime failure
-// declaration to satisfy gcc
-template<class Archive, class T>
-BOOST_DLLEXPORT const basic_pointer_oserializer &
-instantiate_pointer_oserializer(
-    Archive * /* ar = NULL */,
-    T * /* t = NULL */
-) BOOST_USED ;
-// definition
-template<class Archive, class T>
-BOOST_DLLEXPORT const basic_pointer_oserializer &
-instantiate_pointer_oserializer(
-    Archive * /* ar = NULL */,
-    T * /* t = NULL */
-){
-    return pointer_oserializer<Archive, T>::instance;
-}
-#endif
-
 } // detail
 
 template<class Archive, class T>
@@ -561,7 +529,7 @@
     // serialization library and should be double checked.  See documentation on
     // object tracking.  Also, see the "rationale" section of the documenation
     // for motivation for this checking.
-    BOOST_STATIC_ASSERT(check_tracking<T>::value);
+    BOOST_STATIC_WARNING(check_tracking<T>::value);
         save(ar, const_cast<const T &>(t));
 }
 #endif

Deleted: branches/release/boost/archive/detail/polymorphic_iarchive_dispatch.hpp
==============================================================================
--- branches/release/boost/archive/detail/polymorphic_iarchive_dispatch.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
+++ (empty file)
@@ -1,197 +0,0 @@
-#ifndef BOOST_ARCHIVE_DETAIL_POLYMORPHIC_IARCHIVE_DISPATCH_HPP
-#define BOOST_ARCHIVE_DETAIL_POLYMORPHIC_IARCHIVE_DISPATCH_HPP
-
-// MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// polymorphic_iarchive_dispatch.hpp
-
-// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for updates, documentation, and revision history.
-
-#include <cstddef>
-#include <string>
-#include <ostream>
-#include <boost/noncopyable.hpp>
-#include <boost/cstdint.hpp>
-
-#include <boost/config.hpp>
-#if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{
-    using ::size_t;
-} // namespace std
-#endif
-
-#include <boost/archive/polymorphic_iarchive.hpp>
-#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
-
-namespace boost {
-template<class T>
-class shared_ptr;
-namespace serialization {
-    class extended_type_info;
-} // namespace serialization
-namespace archive {
-namespace detail{
-
-class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iserializer;
-class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer;
-
-template<class ArchiveImplementation>
-class polymorphic_iarchive_dispatch :
-    public polymorphic_iarchive,
-    // note: gcc dynamic cross cast fails if the the derivation below is
-    // not public.  I think this is a mistake.
-    public /*protected*/ ArchiveImplementation,
-    private boost::noncopyable
-{
-private:
-    // these are used by the serialization library.
-    virtual void load_object(
-        void *t,
-        const basic_iserializer & bis
-    ){
-        ArchiveImplementation::load_object(t, bis);
-    }
-    virtual const basic_pointer_iserializer * load_pointer(
-        void * & t,
-        const basic_pointer_iserializer * bpis_ptr,
-        const basic_pointer_iserializer * (*finder)(
-            const boost::serialization::extended_type_info & type
-        )
-    ){
-        return ArchiveImplementation::load_pointer(t, bpis_ptr, finder);
-    }
-    virtual void set_library_version(unsigned int archive_library_version){
-        ArchiveImplementation::set_library_version(archive_library_version);
-    }
-    virtual unsigned int get_library_version() const{
-        return ArchiveImplementation::get_library_version();
-    }
-    virtual unsigned int get_flags() const {
-        return ArchiveImplementation::get_flags();
-    }
-    virtual void delete_created_pointers(){
-        ArchiveImplementation::delete_created_pointers();
-    }
-    virtual void reset_object_address(
-        const void * new_address,
-        const void * old_address
-    ){
-        ArchiveImplementation::reset_object_address(new_address, old_address);
-    }
-    virtual void load_binary(void * t, std::size_t size){
-        ArchiveImplementation::load_binary(t, size);
-    }
-    // primitive types the only ones permitted by polymorphic archives
-    virtual void load(bool & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(char & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(signed char & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(unsigned char & t){
-        ArchiveImplementation::load(t);
-    }
-    #ifndef BOOST_NO_CWCHAR
-    #ifndef BOOST_NO_INTRINSIC_WCHAR_T
-    virtual void load(wchar_t & t){
-        ArchiveImplementation::load(t);
-    }
-    #endif
-    #endif
-    virtual void load(short & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(unsigned short & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(int & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(unsigned int & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(long & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(unsigned long & t){
-        ArchiveImplementation::load(t);
-    }
-    #if !defined(BOOST_NO_INTRINSIC_INT64_T)
-    virtual void load(boost::int64_t & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(boost::uint64_t & t){
-        ArchiveImplementation::load(t);
-    }
-    #endif
-    virtual void load(float & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(double & t){
-        ArchiveImplementation::load(t);
-    }
-    virtual void load(std::string & t){
-        ArchiveImplementation::load(t);
-    }
-    #ifndef BOOST_NO_STD_WSTRING
-    virtual void load(std::wstring & t){
-        ArchiveImplementation::load(t);
-    }
-    #endif
-    // used for xml and other tagged formats default does nothing
-    virtual void load_start(const char * name){
-        ArchiveImplementation::load_start(name);
-    }
-    virtual void load_end(const char * name){
-        ArchiveImplementation::load_end(name);
-    }
-
-    virtual void register_basic_serializer(const basic_iserializer & bis){
-        ArchiveImplementation::register_basic_serializer(bis);
-    }
-public:
-    // this can't be inheriteded because they appear in mulitple
-    // parents
-    typedef mpl::bool_<true> is_loading;
-    typedef mpl::bool_<false> is_saving;
-    // the >> operator
-    template<class T>
-    polymorphic_iarchive & operator>>(T & t){
-        return polymorphic_iarchive::operator>>(t);
-    }
-
-    // the & operator
-    template<class T>
-    polymorphic_iarchive & operator&(T & t){
-        return polymorphic_iarchive::operator&(t);
-    }
-
-    // all current archives take a stream as constructor argument
-    template <class _Elem, class _Tr>
-    polymorphic_iarchive_dispatch(
-        std::basic_istream<_Elem, _Tr> & is,
-        unsigned int flags = 0
-    ) :
-        ArchiveImplementation(is, flags)
-    {}
-};
-
-} // namespace detail
-} // namespace archive
-} // namespace boost
-
-#include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
-
-#endif // BOOST_ARCHIVE_DETAIL_POLYMORPHIC_IARCHIVE_DISPATCH_HPP

Added: branches/release/boost/archive/detail/polymorphic_iarchive_route.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/archive/detail/polymorphic_iarchive_route.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,196 @@
+#ifndef BOOST_ARCHIVE_DETAIL_POLYMORPHIC_IARCHIVE_ROUTE_HPP
+#define BOOST_ARCHIVE_DETAIL_POLYMORPHIC_IARCHIVE_ROUTE_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// polymorphic_iarchive_route.hpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <string>
+#include <ostream>
+#include <cstddef>
+
+#include <boost/config.hpp>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+    using ::size_t;
+} // namespace std
+#endif
+
+#include <boost/noncopyable.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/archive/polymorphic_iarchive.hpp>
+#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
+
+namespace boost {
+namespace serialization {
+    class extended_type_info;
+} // namespace serialization
+namespace archive {
+namespace detail{
+
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iserializer;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer;
+
+template<class ArchiveImplementation>
+class polymorphic_iarchive_route :
+    public polymorphic_iarchive,
+    // note: gcc dynamic cross cast fails if the the derivation below is
+    // not public.  I think this is a mistake.
+    public /*protected*/ ArchiveImplementation,
+    private boost::noncopyable
+{
+private:
+    // these are used by the serialization library.
+    virtual void load_object(
+        void *t,
+        const basic_iserializer & bis
+    ){
+        ArchiveImplementation::load_object(t, bis);
+    }
+    virtual const basic_pointer_iserializer * load_pointer(
+        void * & t,
+        const basic_pointer_iserializer * bpis_ptr,
+        const basic_pointer_iserializer * (*finder)(
+            const boost::serialization::extended_type_info & type
+        )
+    ){
+        return ArchiveImplementation::load_pointer(t, bpis_ptr, finder);
+    }
+    virtual void set_library_version(unsigned int archive_library_version){
+        ArchiveImplementation::set_library_version(archive_library_version);
+    }
+    virtual unsigned int get_library_version() const{
+        return ArchiveImplementation::get_library_version();
+    }
+    virtual unsigned int get_flags() const {
+        return ArchiveImplementation::get_flags();
+    }
+    virtual void delete_created_pointers(){
+        ArchiveImplementation::delete_created_pointers();
+    }
+    virtual void reset_object_address(
+        const void * new_address,
+        const void * old_address
+    ){
+        ArchiveImplementation::reset_object_address(new_address, old_address);
+    }
+    virtual void load_binary(void * t, std::size_t size){
+        ArchiveImplementation::load_binary(t, size);
+    }
+    // primitive types the only ones permitted by polymorphic archives
+    virtual void load(bool & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(char & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(signed char & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(unsigned char & t){
+        ArchiveImplementation::load(t);
+    }
+    #ifndef BOOST_NO_CWCHAR
+    #ifndef BOOST_NO_INTRINSIC_WCHAR_T
+    virtual void load(wchar_t & t){
+        ArchiveImplementation::load(t);
+    }
+    #endif
+    #endif
+    virtual void load(short & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(unsigned short & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(int & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(unsigned int & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(long & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(unsigned long & t){
+        ArchiveImplementation::load(t);
+    }
+    #if !defined(BOOST_NO_INTRINSIC_INT64_T)
+    virtual void load(boost::int64_t & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(boost::uint64_t & t){
+        ArchiveImplementation::load(t);
+    }
+    #endif
+    virtual void load(float & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(double & t){
+        ArchiveImplementation::load(t);
+    }
+    virtual void load(std::string & t){
+        ArchiveImplementation::load(t);
+    }
+    #ifndef BOOST_NO_STD_WSTRING
+    virtual void load(std::wstring & t){
+        ArchiveImplementation::load(t);
+    }
+    #endif
+    // used for xml and other tagged formats default does nothing
+    virtual void load_start(const char * name){
+        ArchiveImplementation::load_start(name);
+    }
+    virtual void load_end(const char * name){
+        ArchiveImplementation::load_end(name);
+    }
+
+    virtual void register_basic_serializer(const basic_iserializer & bis){
+        ArchiveImplementation::register_basic_serializer(bis);
+    }
+public:
+    // this can't be inheriteded because they appear in mulitple
+    // parents
+    typedef mpl::bool_<true> is_loading;
+    typedef mpl::bool_<false> is_saving;
+    // the >> operator
+    template<class T>
+    polymorphic_iarchive & operator>>(T & t){
+        return polymorphic_iarchive::operator>>(t);
+    }
+
+    // the & operator
+    template<class T>
+    polymorphic_iarchive & operator&(T & t){
+        return polymorphic_iarchive::operator&(t);
+    }
+
+    // all current archives take a stream as constructor argument
+    template <class _Elem, class _Tr>
+    polymorphic_iarchive_route(
+        std::basic_istream<_Elem, _Tr> & is,
+        unsigned int flags = 0
+    ) :
+        ArchiveImplementation(is, flags)
+    {}
+    virtual ~polymorphic_iarchive_route(){};
+};
+
+} // namespace detail
+} // namespace archive
+} // namespace boost
+
+#include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
+
+#endif // BOOST_ARCHIVE_DETAIL_POLYMORPHIC_IARCHIVE_DISPATCH_HPP

Deleted: branches/release/boost/archive/detail/polymorphic_oarchive_dispatch.hpp
==============================================================================
--- branches/release/boost/archive/detail/polymorphic_oarchive_dispatch.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
+++ (empty file)
@@ -1,185 +0,0 @@
-#ifndef BOOST_ARCHIVE_DETAIL_POLYMORPHIC_OARCHIVE_DISPATCH_HPP
-#define BOOST_ARCHIVE_DETAIL_POLYMORPHIC_OARCHIVE_DISPATCH_HPP
-
-// MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// polymorphic_oarchive_dispatch.hpp
-
-// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for updates, documentation, and revision history.
-
-#include <string>
-#include <ostream>
-#include <boost/noncopyable.hpp>
-#include <boost/cstdint.hpp>
-#include <cstddef> // size_t
-
-#include <boost/config.hpp>
-#if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{
-    using ::size_t;
-} // namespace std
-#endif
-
-#include <boost/archive/polymorphic_oarchive.hpp>
-#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
-
-namespace boost {
-template<class T>
-class shared_ptr;
-namespace serialization {
-    class extended_type_info;
-} // namespace serialization
-namespace archive {
-namespace detail{
-
-class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oserializer;
-class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer;
-
-template<class ArchiveImplementation>
-class polymorphic_oarchive_dispatch :
-    public polymorphic_oarchive,
-    // note: gcc dynamic cross cast fails if the the derivation below is
-    // not public.  I think this is a mistake.
-    public /*protected*/ ArchiveImplementation,
-    private boost::noncopyable
-{
-private:
-    // these are used by the serialization library.
-    virtual void save_object(
-        const void *x,
-        const detail::basic_oserializer & bos
-    ){
-        ArchiveImplementation::save_object(x, bos);
-    }
-    virtual void save_pointer(
-        const void * t,
-        const detail::basic_pointer_oserializer * bpos_ptr
-    ){
-        ArchiveImplementation::save_pointer(t, bpos_ptr);
-    }
-    virtual void save_null_pointer(){
-        ArchiveImplementation::save_null_pointer();
-    }
-    // primitive types the only ones permitted by polymorphic archives
-    virtual void save(const bool t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const char t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const signed char t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const unsigned char t){
-        ArchiveImplementation::save(t);
-    }
-    #ifndef BOOST_NO_CWCHAR
-    #ifndef BOOST_NO_INTRINSIC_WCHAR_T
-    virtual void save(const wchar_t t){
-        ArchiveImplementation::save(t);
-    }
-    #endif
-    #endif
-    virtual void save(const short t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const unsigned short t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const int t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const unsigned int t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const long t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const unsigned long t){
-        ArchiveImplementation::save(t);
-    }
-    #if !defined(BOOST_NO_INTRINSIC_INT64_T)
-    virtual void save(const boost::int64_t t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const boost::uint64_t t){
-        ArchiveImplementation::save(t);
-    }
-    #endif
-    virtual void save(const float t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const double t){
-        ArchiveImplementation::save(t);
-    }
-    virtual void save(const std::string & t){
-        ArchiveImplementation::save(t);
-    }
-    #ifndef BOOST_NO_STD_WSTRING
-    virtual void save(const std::wstring & t){
-        ArchiveImplementation::save(t);
-    }
-    #endif
-    virtual unsigned int get_library_version() const{
-        return ArchiveImplementation::get_library_version();
-    }
-    virtual unsigned int get_flags() const {
-        return ArchiveImplementation::get_flags();
-    }
-    virtual void save_binary(const void * t, std::size_t size){
-        ArchiveImplementation::save_binary(t, size);
-    }
-    // used for xml and other tagged formats default does nothing
-    virtual void save_start(const char * name){
-        ArchiveImplementation::save_start(name);
-    }
-    virtual void save_end(const char * name){
-        ArchiveImplementation::save_end(name);
-    }
-    virtual void end_preamble(){
-        ArchiveImplementation::end_preamble();
-    }
-    virtual void register_basic_serializer(const detail::basic_oserializer & bos){
-        ArchiveImplementation::register_basic_serializer(bos);
-    }
-public:
-    // this can't be inheriteded because they appear in mulitple
-    // parents
-    typedef mpl::bool_<false> is_loading;
-    typedef mpl::bool_<true> is_saving;
-    // the << operator
-    template<class T>
-    polymorphic_oarchive & operator<<(T & t){
-        return polymorphic_oarchive::operator<<(t);
-    }
-    // the & operator
-    template<class T>
-    polymorphic_oarchive & operator&(T & t){
-        return polymorphic_oarchive::operator&(t);
-    }
-    // all current archives take a stream as constructor argument
-    template <class _Elem, class _Tr>
-    polymorphic_oarchive_dispatch(
-        std::basic_ostream<_Elem, _Tr> & os,
-        unsigned int flags = 0
-    ) :
-        ArchiveImplementation(os, flags)
-    {}
-};
-
-} // namespace detail
-} // namespace archive
-} // namespace boost
-
-#include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
-
-#endif // BOOST_ARCHIVE_DETAIL_POLYMORPHIC_OARCHIVE_DISPATCH_HPP

Added: branches/release/boost/archive/detail/polymorphic_oarchive_route.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/archive/detail/polymorphic_oarchive_route.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,184 @@
+#ifndef BOOST_ARCHIVE_DETAIL_POLYMORPHIC_OARCHIVE_ROUTE_HPP
+#define BOOST_ARCHIVE_DETAIL_POLYMORPHIC_OARCHIVE_ROUTE_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// polymorphic_oarchive_route.hpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <string>
+#include <ostream>
+#include <boost/noncopyable.hpp>
+#include <boost/cstdint.hpp>
+#include <cstddef> // size_t
+
+#include <boost/config.hpp>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+    using ::size_t;
+} // namespace std
+#endif
+
+#include <boost/archive/polymorphic_oarchive.hpp>
+#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
+
+namespace boost {
+namespace serialization {
+    class extended_type_info;
+} // namespace serialization
+namespace archive {
+namespace detail{
+
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oserializer;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer;
+
+template<class ArchiveImplementation>
+class polymorphic_oarchive_route :
+    public polymorphic_oarchive,
+    // note: gcc dynamic cross cast fails if the the derivation below is
+    // not public.  I think this is a mistake.
+    public /*protected*/ ArchiveImplementation,
+    private boost::noncopyable
+{
+private:
+    // these are used by the serialization library.
+    virtual void save_object(
+        const void *x,
+        const detail::basic_oserializer & bos
+    ){
+        ArchiveImplementation::save_object(x, bos);
+    }
+    virtual void save_pointer(
+        const void * t,
+        const detail::basic_pointer_oserializer * bpos_ptr
+    ){
+        ArchiveImplementation::save_pointer(t, bpos_ptr);
+    }
+    virtual void save_null_pointer(){
+        ArchiveImplementation::save_null_pointer();
+    }
+    // primitive types the only ones permitted by polymorphic archives
+    virtual void save(const bool t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const char t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const signed char t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const unsigned char t){
+        ArchiveImplementation::save(t);
+    }
+    #ifndef BOOST_NO_CWCHAR
+    #ifndef BOOST_NO_INTRINSIC_WCHAR_T
+    virtual void save(const wchar_t t){
+        ArchiveImplementation::save(t);
+    }
+    #endif
+    #endif
+    virtual void save(const short t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const unsigned short t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const int t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const unsigned int t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const long t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const unsigned long t){
+        ArchiveImplementation::save(t);
+    }
+    #if !defined(BOOST_NO_INTRINSIC_INT64_T)
+    virtual void save(const boost::int64_t t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const boost::uint64_t t){
+        ArchiveImplementation::save(t);
+    }
+    #endif
+    virtual void save(const float t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const double t){
+        ArchiveImplementation::save(t);
+    }
+    virtual void save(const std::string & t){
+        ArchiveImplementation::save(t);
+    }
+    #ifndef BOOST_NO_STD_WSTRING
+    virtual void save(const std::wstring & t){
+        ArchiveImplementation::save(t);
+    }
+    #endif
+    virtual unsigned int get_library_version() const{
+        return ArchiveImplementation::get_library_version();
+    }
+    virtual unsigned int get_flags() const {
+        return ArchiveImplementation::get_flags();
+    }
+    virtual void save_binary(const void * t, std::size_t size){
+        ArchiveImplementation::save_binary(t, size);
+    }
+    // used for xml and other tagged formats default does nothing
+    virtual void save_start(const char * name){
+        ArchiveImplementation::save_start(name);
+    }
+    virtual void save_end(const char * name){
+        ArchiveImplementation::save_end(name);
+    }
+    virtual void end_preamble(){
+        ArchiveImplementation::end_preamble();
+    }
+    virtual void register_basic_serializer(const detail::basic_oserializer & bos){
+        ArchiveImplementation::register_basic_serializer(bos);
+    }
+public:
+    // this can't be inheriteded because they appear in mulitple
+    // parents
+    typedef mpl::bool_<false> is_loading;
+    typedef mpl::bool_<true> is_saving;
+    // the << operator
+    template<class T>
+    polymorphic_oarchive & operator<<(T & t){
+        return polymorphic_oarchive::operator<<(t);
+    }
+    // the & operator
+    template<class T>
+    polymorphic_oarchive & operator&(T & t){
+        return polymorphic_oarchive::operator&(t);
+    }
+    // all current archives take a stream as constructor argument
+    template <class _Elem, class _Tr>
+    polymorphic_oarchive_route(
+        std::basic_ostream<_Elem, _Tr> & os,
+        unsigned int flags = 0
+    ) :
+        ArchiveImplementation(os, flags)
+    {}
+    virtual ~polymorphic_oarchive_route(){};
+};
+
+} // namespace detail
+} // namespace archive
+} // namespace boost
+
+#include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
+
+#endif // BOOST_ARCHIVE_DETAIL_POLYMORPHIC_OARCHIVE_DISPATCH_HPP

Modified: branches/release/boost/archive/detail/register_archive.hpp
==============================================================================
--- branches/release/boost/archive/detail/register_archive.hpp	(original)
+++ branches/release/boost/archive/detail/register_archive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -4,10 +4,16 @@
 #ifndef BOOST_ARCHIVE_DETAIL_REGISTER_ARCHIVE_DWA2006521_HPP
 # define BOOST_ARCHIVE_DETAIL_REGISTER_ARCHIVE_DWA2006521_HPP
 
-# include <boost/type_traits/add_pointer.hpp>
-
 namespace boost { namespace archive { namespace detail { 
 
+// No instantiate_ptr_serialization overloads generated by
+// BOOST_SERIALIZATION_REGISTER_ARCHIVE that lexically follow the call
+// will be seen *unless* they are in an associated namespace of one of
+// the arguments, so we pass one of these along to make sure this
+// namespace is considered.  See temp.dep.candidate (14.6.4.2) in the
+// standard.
+struct adl_tag {};
+
 template <class Archive, class Serializable>
 struct ptr_serialization_support;
 
@@ -26,7 +32,7 @@
 // in overload resolution with the functions declared by
 // BOOST_SERIALIZATION_REGISTER_ARCHIVE, below.
 template <class Serializable>
-void instantiate_ptr_serialization(Serializable*, int) {}
+void instantiate_ptr_serialization(Serializable*, int, adl_tag ) {}
 
 // The function declaration generated by this macro never actually
 // gets called, but its return type gets instantiated, and that's
@@ -37,8 +43,8 @@
 namespace boost { namespace archive { namespace detail {                \
                                                                         \
 template <class Serializable>                                           \
-typename _ptr_serialization_support<Archive, Serializable>::type        \
-instantiate_ptr_serialization( Serializable*, Archive* );               \
+BOOST_DEDUCED_TYPENAME _ptr_serialization_support<Archive, Serializable>::type  \
+instantiate_ptr_serialization( Serializable*, Archive*, adl_tag );              \
                                                                         \
 }}}
 

Modified: branches/release/boost/archive/detail/utf8_codecvt_facet.hpp
==============================================================================
--- branches/release/boost/archive/detail/utf8_codecvt_facet.hpp	(original)
+++ branches/release/boost/archive/detail/utf8_codecvt_facet.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,4 +1,4 @@
-// Copyright © 2001 Ronald Garcia, Indiana University (garcia_at_[hidden])
+// Copyright (c) 2001 Ronald Garcia, Indiana University (garcia_at_[hidden])
 // Andrew Lumsdaine, Indiana University (lums_at_[hidden]).
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at

Modified: branches/release/boost/archive/impl/archive_pointer_iserializer.ipp
==============================================================================
--- branches/release/boost/archive/impl/archive_pointer_iserializer.ipp	(original)
+++ branches/release/boost/archive/impl/archive_pointer_iserializer.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,10 +8,17 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <utility>
 #include <cassert>
-
+#include <cstddef>
 #include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{ 
+    using ::size_t; 
+} // namespace std
+#endif
 
+#include <boost/serialization/singleton.hpp>
 #include <boost/archive/detail/basic_serializer_map.hpp>
 #include <boost/archive/detail/archive_pointer_iserializer.hpp>
 
@@ -19,12 +26,11 @@
 namespace archive {
 namespace detail {
 
-template<class Archive>
-basic_serializer_map * 
-iserializer_map(){
-    static bool deleted = false;
-    static basic_serializer_map map(deleted);
-    return deleted ? NULL : & map;
+namespace { // anon
+    template<class Archive>
+    class iserializer_map : public basic_serializer_map 
+    {
+    };
 }
 
 template<class Archive>
@@ -34,9 +40,11 @@
 ) :
     basic_pointer_iserializer(eti)
 {
-    basic_serializer_map *mp = iserializer_map<Archive>();
-    assert(NULL != mp);
-    mp->insert(this);
+    std::pair<BOOST_DEDUCED_TYPENAME  iserializer_map<Archive>::iterator, bool> result;
+    result = serialization::singleton<
+            iserializer_map<Archive> 
+        >::get_mutable_instance().insert(this);
+    assert(result.second);
 }
 
 template<class Archive>
@@ -44,20 +52,29 @@
 archive_pointer_iserializer<Archive>::find(
     const boost::serialization::extended_type_info & eti
 ){
-    basic_serializer_map *mp = iserializer_map<Archive>();
-    assert(NULL != mp);
-    return static_cast<const basic_pointer_iserializer *>(mp->tfind(eti));
+    const basic_serializer_arg bs(eti);
+    BOOST_DEDUCED_TYPENAME iserializer_map<Archive>::const_iterator it;
+    it = boost::serialization::singleton<
+            iserializer_map<Archive> 
+         >::get_const_instance().find(& bs);
+    assert(
+        it 
+        != 
+        boost::serialization::singleton<
+                iserializer_map<Archive> 
+            >::get_const_instance().end()
+    );
+    return static_cast<const basic_pointer_iserializer *>(*it);
 }
 
 template<class Archive>
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
 archive_pointer_iserializer<Archive>::~archive_pointer_iserializer(){
-    // note: we need to check that the map still exists as we can't depend
-    // on static variables being constructed in a specific sequence
-    basic_serializer_map *mp = iserializer_map<Archive>();
-    if(NULL == mp)
-        return;
-    mp->erase(this);
+    std::size_t count;
+    count = serialization::singleton<
+            iserializer_map<Archive> 
+        >::get_mutable_instance().erase(this);
+    assert(count);
 }
 
 } // namespace detail

Modified: branches/release/boost/archive/impl/archive_pointer_oserializer.ipp
==============================================================================
--- branches/release/boost/archive/impl/archive_pointer_oserializer.ipp	(original)
+++ branches/release/boost/archive/impl/archive_pointer_oserializer.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,21 +8,24 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <utility>
+#include <cassert>
+
 #include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
 
 #include <boost/archive/detail/archive_pointer_oserializer.hpp>
 #include <boost/archive/detail/basic_serializer_map.hpp>
+#include <boost/serialization/singleton.hpp>
 
 namespace boost { 
 namespace archive {
 namespace detail {
 
-template<class Archive>
-basic_serializer_map *
-oserializer_map(){
-    static bool deleted = false;
-    static basic_serializer_map map(deleted);
-    return deleted ? NULL : & map;
+namespace { // anon
+    template<class Archive>
+    class oserializer_map : public basic_serializer_map 
+    {
+    };
 }
 
 template<class Archive>
@@ -32,9 +35,14 @@
 ) :
     basic_pointer_oserializer(eti)
 {
-    basic_serializer_map *mp = oserializer_map<Archive>();
-    assert(NULL != mp);
-    mp->insert(this);
+    std::pair<
+        BOOST_DEDUCED_TYPENAME oserializer_map<Archive>::iterator, 
+        bool
+    > result;
+    result = serialization::singleton<
+            oserializer_map<Archive>
+        >::get_mutable_instance().insert(this);
+    assert(result.second);
 }
 
 template<class Archive>
@@ -42,9 +50,19 @@
 archive_pointer_oserializer<Archive>::find(
     const boost::serialization::extended_type_info & eti
 ){
-    basic_serializer_map *mp = oserializer_map<Archive>();
-    assert(NULL != mp);
-    return static_cast<const basic_pointer_oserializer *>(mp->tfind(eti));
+    const basic_serializer_arg bs(eti);
+    basic_serializer_map::const_iterator it;
+    it =  boost::serialization::singleton<
+            oserializer_map<Archive>
+        >::get_const_instance().find(& bs);
+    assert(
+        it 
+        != 
+        boost::serialization::singleton<
+                oserializer_map<Archive>
+            >::get_const_instance().end()
+    );
+    return static_cast<const basic_pointer_oserializer *>(*it);
 }
 
 template<class Archive>
@@ -52,10 +70,11 @@
 archive_pointer_oserializer<Archive>::~archive_pointer_oserializer(){
     // note: we need to check that the map still exists as we can't depend
     // on static variables being constructed in a specific sequence
-    basic_serializer_map *mp = oserializer_map<Archive>();
-    if(NULL == mp)
-        return;
-    mp->erase(this);
+    unsigned int count;
+    count = serialization::singleton<
+            oserializer_map<Archive>
+        >::get_mutable_instance().erase(this);
+    assert(count);
 }
 
 } // namespace detail

Modified: branches/release/boost/archive/impl/basic_binary_iarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_iarchive.ipp	(original)
+++ branches/release/boost/archive/impl/basic_binary_iarchive.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,7 +22,6 @@
 #include <boost/detail/workaround.hpp>
 
 #include <boost/archive/basic_binary_iarchive.hpp>
-//#include <boost/serialization/extended_type_info.hpp>
 
 namespace boost {
 namespace archive {

Modified: branches/release/boost/archive/impl/basic_binary_iprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_iprimitive.ipp	(original)
+++ branches/release/boost/archive/impl/basic_binary_iprimitive.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,7 +9,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cassert>
-#include <cstddef> // size_t
+#include <cstddef> // size_t, NULL
 #include <cstring> // memcpy
 
 #include <boost/config.hpp>
@@ -95,7 +95,8 @@
     #endif
         s.resize(l);
     // note breaking a rule here - could be a problem on some platform
-    load_binary(const_cast<char *>(s.data()), l);
+    if(0 < l)
+        load_binary(&(*s.begin()), l);
 }
 
 #ifndef BOOST_NO_CWCHAR
@@ -133,6 +134,7 @@
     std::basic_streambuf<Elem, Tr> & sb, 
     bool no_codecvt
 ) :
+#ifndef BOOST_NO_STD_LOCALE
     m_sb(sb),
     archive_locale(NULL),
     locale_saver(m_sb)
@@ -147,6 +149,10 @@
         m_sb.pubimbue(* archive_locale);
     }
 }
+#else
+    m_sb(sb)
+{}
+#endif
 
 // some libraries including stl and libcomo fail if the
 // buffer isn't flushed before the code_cvt facet is changed.

Modified: branches/release/boost/archive/impl/basic_binary_oprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_oprimitive.ipp	(original)
+++ branches/release/boost/archive/impl/basic_binary_oprimitive.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,6 +9,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <ostream>
+#include <cstddef> // NULL
 #include <cstring>
 
 #include <boost/config.hpp>
@@ -103,6 +104,7 @@
     std::basic_streambuf<Elem, Tr> & sb, 
     bool no_codecvt
 ) : 
+#ifndef BOOST_NO_STD_LOCALE
     m_sb(sb),
     archive_locale(NULL),
     locale_saver(m_sb)
@@ -117,6 +119,10 @@
         m_sb.pubimbue(* archive_locale);
     }
 }
+#else
+    m_sb(sb)
+{}
+#endif
 
 // some libraries including stl and libcomo fail if the
 // buffer isn't flushed before the code_cvt facet is changed.

Modified: branches/release/boost/archive/impl/basic_text_iarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_iarchive.ipp	(original)
+++ branches/release/boost/archive/impl/basic_text_iarchive.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,7 +22,6 @@
 #include <boost/detail/workaround.hpp>
 
 #include <boost/archive/basic_text_iarchive.hpp>
-//#include <boost/serialization/extended_type_info.hpp>
 
 namespace boost {
 namespace archive {

Modified: branches/release/boost/archive/impl/basic_text_iprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_iprimitive.ipp	(original)
+++ branches/release/boost/archive/impl/basic_text_iprimitive.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,6 +9,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cstddef> // size_t
+#include <cstddef> // NULL
 
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
@@ -94,7 +95,8 @@
 basic_text_iprimitive<IStream>::basic_text_iprimitive(
     IStream  &is_,
     bool no_codecvt
-) : 
+) :
+#ifndef BOOST_NO_STD_LOCALE
     is(is_),
     flags_saver(is_),
     precision_saver(is_),
@@ -112,6 +114,12 @@
     }
     is >> std::noboolalpha;
 }
+#else
+    is(is_),
+    flags_saver(is_),
+    precision_saver(is_)
+{}
+#endif
 
 template<class IStream>
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())

Modified: branches/release/boost/archive/impl/basic_text_oprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_oprimitive.ipp	(original)
+++ branches/release/boost/archive/impl/basic_text_oprimitive.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,6 +8,7 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
 #include <boost/pfto.hpp>
 
 #include <boost/archive/basic_text_oprimitive.hpp>
@@ -75,6 +76,7 @@
     OStream & os_,
     bool no_codecvt
 ) : 
+#ifndef BOOST_NO_STD_LOCALE
     os(os_),
     flags_saver(os_),
     precision_saver(os_),
@@ -92,6 +94,12 @@
     }
     os << std::noboolalpha;
 }
+#else
+    os(os_),
+    flags_saver(os_),
+    precision_saver(os_)
+{}
+#endif
 
 template<class OStream>
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())

Modified: branches/release/boost/archive/impl/basic_xml_iarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_xml_iarchive.ipp	(original)
+++ branches/release/boost/archive/impl/basic_xml_iarchive.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,13 +9,13 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cassert>
+#include <cstddef> // NULL
 #include <algorithm>
 
 #include <boost/throw_exception.hpp>
 
 #include <boost/archive/basic_xml_iarchive.hpp>
 #include <boost/serialization/tracking.hpp>
-//#include <boost/serialization/extended_type_info.hpp>
 
 namespace boost {
 namespace archive {

Modified: branches/release/boost/archive/impl/basic_xml_oarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_xml_oarchive.ipp	(original)
+++ branches/release/boost/archive/impl/basic_xml_oarchive.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,6 +9,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <algorithm>
+#include <cstddef> // NULL
 #include <cstring>
 #if defined(BOOST_NO_STDC_NAMESPACE) && ! defined(__LIBCOMO__)
 namespace std{
@@ -18,6 +19,7 @@
 
 #include <boost/archive/basic_xml_archive.hpp>
 #include <boost/archive/basic_xml_oarchive.hpp>
+#include <boost/archive/xml_archive_exception.hpp>
 #include <boost/detail/no_exceptions_support.hpp>
 
 namespace boost {
@@ -78,7 +80,7 @@
     this->This()->put(' ');
     this->This()->put(attribute_name);
     this->This()->put("=\"");
-    this->This()->put(key);
+    this->This()->save(key);
     this->This()->put('"');
 }
 
@@ -174,7 +176,9 @@
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
 basic_xml_oarchive<Archive>::save_override(const object_id_type & t, int)
 {
-    write_attribute(OBJECT_ID(), t, "=\"_");
+    // borland doesn't do conversion of STRONG_TYPEDEFs very well
+    const unsigned int i = t;
+    write_attribute(OBJECT_ID(), i, "=\"_");
 }
 template<class Archive>
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
@@ -182,13 +186,15 @@
     const object_reference_type & t,
     int
 ){
-    write_attribute(OBJECT_REFERENCE(), t, "=\"_");
+    const unsigned int i = t;
+    write_attribute(OBJECT_REFERENCE(), i, "=\"_");
 }
 template<class Archive>
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
 basic_xml_oarchive<Archive>::save_override(const version_type & t, int)
 {
-    write_attribute(VERSION(), t);
+    const unsigned int i = t;
+    write_attribute(VERSION(), i);
 }
 
 template<class Archive>
@@ -258,7 +264,7 @@
 basic_xml_oarchive<Archive>::~basic_xml_oarchive(){
     if(0 == (this->get_flags() & no_header)){
         BOOST_TRY{
-                this->This()->put("</boost_serialization>");
+                this->This()->put("</boost_serialization>\n");
         }
         BOOST_CATCH(...){}
         BOOST_CATCH_END

Modified: branches/release/boost/archive/impl/text_iarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/text_iarchive_impl.ipp	(original)
+++ branches/release/boost/archive/impl/text_iarchive_impl.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -12,7 +12,7 @@
 // implementation of basic_text_iprimitive overrides for the combination
 // of template parameters used to implement a text_iprimitive
 
-#include <cstddef> // size_t
+#include <cstddef> // size_t, NULL
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
@@ -53,7 +53,8 @@
     if(NULL != s.data())
     #endif
         s.resize(size);
-    is.read(const_cast<char *>(s.data()), size);
+    if(0 < size)
+    	is.read(&(*s.begin()), size);
 }
 
 #ifndef BOOST_NO_CWCHAR

Modified: branches/release/boost/archive/impl/text_wiarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/text_wiarchive_impl.ipp	(original)
+++ branches/release/boost/archive/impl/text_wiarchive_impl.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,7 +8,7 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <cstddef> // size_t
+#include <cstddef> // size_t, NULL
 
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)

Modified: branches/release/boost/archive/impl/xml_iarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/xml_iarchive_impl.ipp	(original)
+++ branches/release/boost/archive/impl/xml_iarchive_impl.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -10,6 +10,7 @@
 
 #include <boost/config.hpp>
 #include <cstring> // memcpy
+#include <cstddef> // NULL
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::memcpy;
@@ -32,7 +33,7 @@
 
 #include <boost/detail/no_exceptions_support.hpp>
 
-#include <boost/archive/archive_exception.hpp>
+#include <boost/archive/xml_archive_exception.hpp>
 #include <boost/archive/iterators/dataflow_exception.hpp>
 #include <boost/archive/basic_xml_archive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
@@ -143,7 +144,9 @@
 xml_iarchive_impl<Archive>::load_override(class_name_type & t, int){
     const std::string & s = gimpl->rv.class_name;
     if(s.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1)
-        boost::throw_exception(archive_exception::invalid_class_name);
+        boost::throw_exception(
+            archive_exception(archive_exception::invalid_class_name)
+       );
     char * tptr = t;
     std::memcpy(tptr, s.data(), s.size());
     tptr[s.size()] = '\0';

Modified: branches/release/boost/archive/impl/xml_wiarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/xml_wiarchive_impl.ipp	(original)
+++ branches/release/boost/archive/impl/xml_wiarchive_impl.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -34,7 +34,7 @@
 
 #include <boost/serialization/string.hpp>
 #include <boost/archive/add_facet.hpp>
-#include <boost/archive/archive_exception.hpp>
+#include <boost/archive/xml_archive_exception.hpp>
 #include <boost/archive/detail/utf8_codecvt_facet.hpp>
 
 #include <boost/archive/iterators/mb_from_wchar.hpp>
@@ -136,7 +136,9 @@
 xml_wiarchive_impl<Archive>::load_override(class_name_type & t, int){
     const std::wstring & ws = gimpl->rv.class_name;
     if(ws.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1)
-        boost::throw_exception(archive_exception::invalid_class_name);
+        boost::throw_exception(
+            archive_exception(archive_exception::invalid_class_name)
+        );
     copy_to_ptr(t, ws);
 }
 

Modified: branches/release/boost/archive/iterators/escape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/escape.hpp	(original)
+++ branches/release/boost/archive/iterators/escape.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,6 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cassert>
+#include <cstddef> // NULL
 
 #include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
 #include <boost/iterator/iterator_adaptor.hpp>

Modified: branches/release/boost/archive/iterators/insert_linebreaks.hpp
==============================================================================
--- branches/release/boost/archive/iterators/insert_linebreaks.hpp	(original)
+++ branches/release/boost/archive/iterators/insert_linebreaks.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -7,7 +7,7 @@
 #endif
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// binary_from_base64.hpp
+// insert_linebreaks.hpp
 
 // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
 // Use, modification and distribution is subject to the Boost Software

Modified: branches/release/boost/archive/iterators/istream_iterator.hpp
==============================================================================
--- branches/release/boost/archive/iterators/istream_iterator.hpp	(original)
+++ branches/release/boost/archive/iterators/istream_iterator.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -21,6 +21,7 @@
 // for wchar_t based streams on systems for which wchar_t not a true
 // type but rather a synonym for some integer type.
 
+#include <cstddef> // NULL
 #include <istream>
 #include <boost/iterator/iterator_facade.hpp>
 

Modified: branches/release/boost/archive/iterators/remove_whitespace.hpp
==============================================================================
--- branches/release/boost/archive/iterators/remove_whitespace.hpp	(original)
+++ branches/release/boost/archive/iterators/remove_whitespace.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -7,7 +7,7 @@
 #endif
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// binary_from_base64.hpp
+// remove_whitespace.hpp
 
 // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
 // Use, modification and distribution is subject to the Boost Software

Modified: branches/release/boost/archive/polymorphic_binary_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_binary_iarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_binary_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,17 +18,17 @@
 
 #include <boost/config.hpp>
 #include <boost/archive/binary_iarchive.hpp>
-#include <boost/archive/detail/polymorphic_iarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
 class polymorphic_binary_iarchive : 
-    public detail::polymorphic_iarchive_dispatch<naked_binary_iarchive>
+    public detail::polymorphic_iarchive_route<naked_binary_iarchive>
 {
 public:
     polymorphic_binary_iarchive(std::istream & is, unsigned int flags = 0) :
-        detail::polymorphic_iarchive_dispatch<naked_binary_iarchive>(is, flags)
+        detail::polymorphic_iarchive_route<naked_binary_iarchive>(is, flags)
     {}
     ~polymorphic_binary_iarchive(){}
 };

Modified: branches/release/boost/archive/polymorphic_binary_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_binary_oarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_binary_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,12 +18,12 @@
 
 #include <boost/config.hpp>
 #include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/detail/polymorphic_oarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_oarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
-typedef detail::polymorphic_oarchive_dispatch<
+typedef detail::polymorphic_oarchive_route<
     binary_oarchive_impl<
         naked_binary_oarchive, 
         std::ostream::char_type, 

Modified: branches/release/boost/archive/polymorphic_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_iarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,6 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cstddef> // std::size_t
+#include <climits> // ULONG_MAX 
 #include <boost/config.hpp>
 
 #if defined(BOOST_NO_STDC_NAMESPACE)
@@ -38,9 +39,16 @@
 // i.e. that its not a synonym for (unsigned) long
 // if there is no 64 bit int or if its the same as a long
 // we shouldn't define separate functions for int64 data types.
-#if defined(BOOST_NO_INT64_T) \
-    || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-#   define BOOST_NO_INTRINSIC_INT64_T
+#if defined(BOOST_NO_INT64_T)
+    #define BOOST_NO_INTRINSIC_INT64_T
+#else 
+    #if defined(ULONG_MAX)
+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+            #define BOOST_NO_INTRINSIC_INT64_T
+        #endif
+    #else 
+        #define BOOST_NO_INTRINSIC_INT64_T
+    #endif
 #endif
 
 namespace boost {
@@ -123,7 +131,7 @@
         load_end(t.name());
     }
 protected:
-    virtual ~polymorphic_iarchive_impl(){}
+    virtual ~polymorphic_iarchive_impl(){};
 public:
     // utility function implemented by all legal archives
     virtual void set_library_version(unsigned int archive_library_version) = 0;
@@ -166,7 +174,10 @@
 class polymorphic_iarchive : 
     public polymorphic_iarchive_impl,
     public detail::shared_ptr_helper
-{};
+{
+public:
+    virtual ~polymorphic_iarchive(){};
+};
 
 } // namespace archive
 } // namespace boost

Modified: branches/release/boost/archive/polymorphic_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_oarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,6 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cstddef> // size_t
+#include <climits> // ULONG_MAX 
 #include <string>
 
 #include <boost/config.hpp>
@@ -37,9 +38,16 @@
 // i.e. that its not a synonym for (unsigned) long
 // if there is no 64 bit int or if its the same as a long
 // we shouldn't define separate functions for int64 data types.
-#if defined(BOOST_NO_INT64_T) \
-    || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-#   define BOOST_NO_INTRINSIC_INT64_T
+#if defined(BOOST_NO_INT64_T)
+    #define BOOST_NO_INTRINSIC_INT64_T
+#else 
+    #if defined(ULONG_MAX)
+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+            #define BOOST_NO_INTRINSIC_INT64_T
+        #endif
+    #else 
+        #define BOOST_NO_INTRINSIC_INT64_T
+    #endif
 #endif
 
 namespace boost {
@@ -123,7 +131,7 @@
         save_end(t.name());
     }
 protected:
-    virtual ~polymorphic_oarchive_impl(){}
+    virtual ~polymorphic_oarchive_impl(){};
 public:
     // utility functions implemented by all legal archives
     virtual unsigned int get_flags() const = 0;
@@ -143,7 +151,10 @@
 // note: preserve naming symmetry
 class polymorphic_oarchive : 
     public polymorphic_oarchive_impl
-{};
+{
+public:
+    virtual ~polymorphic_oarchive(){};
+};
 
 } // namespace archive
 } // namespace boost

Modified: branches/release/boost/archive/polymorphic_text_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_text_iarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_text_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,17 +18,17 @@
 
 #include <boost/config.hpp>
 #include <boost/archive/text_iarchive.hpp>
-#include <boost/archive/detail/polymorphic_iarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
 class polymorphic_text_iarchive : 
-    public detail::polymorphic_iarchive_dispatch<naked_text_iarchive>
+    public detail::polymorphic_iarchive_route<naked_text_iarchive>
 {
 public:
     polymorphic_text_iarchive(std::istream & is, unsigned int flags = 0) :
-        detail::polymorphic_iarchive_dispatch<naked_text_iarchive>(is, flags)
+        detail::polymorphic_iarchive_route<naked_text_iarchive>(is, flags)
     {}
     ~polymorphic_text_iarchive(){}
 };

Modified: branches/release/boost/archive/polymorphic_text_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_text_oarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_text_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,12 +18,12 @@
 
 #include <boost/config.hpp>
 #include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/detail/polymorphic_oarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_oarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
-typedef detail::polymorphic_oarchive_dispatch<
+typedef detail::polymorphic_oarchive_route<
     text_oarchive_impl<naked_text_oarchive> 
 > polymorphic_text_oarchive;
 

Modified: branches/release/boost/archive/polymorphic_text_wiarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_text_wiarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_text_wiarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,12 +22,12 @@
 #else
 
 #include <boost/archive/text_wiarchive.hpp>
-#include <boost/archive/detail/polymorphic_iarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
-typedef detail::polymorphic_iarchive_dispatch<
+typedef detail::polymorphic_iarchive_route<
         text_wiarchive_impl<naked_text_wiarchive> 
 > polymorphic_text_wiarchive;
 

Modified: branches/release/boost/archive/polymorphic_text_woarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_text_woarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_text_woarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,12 +22,12 @@
 #else
 
 #include <boost/archive/text_woarchive.hpp>
-#include <boost/archive/detail/polymorphic_oarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_oarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
-typedef detail::polymorphic_oarchive_dispatch<
+typedef detail::polymorphic_oarchive_route<
         text_woarchive_impl<naked_text_woarchive> 
 > polymorphic_text_woarchive;
 

Modified: branches/release/boost/archive/polymorphic_xml_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_xml_iarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_xml_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,17 +18,17 @@
 
 #include <boost/config.hpp>
 #include <boost/archive/xml_iarchive.hpp>
-#include <boost/archive/detail/polymorphic_iarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
 class polymorphic_xml_iarchive : 
-    public detail::polymorphic_iarchive_dispatch<naked_xml_iarchive>
+    public detail::polymorphic_iarchive_route<naked_xml_iarchive>
 {
 public:
     polymorphic_xml_iarchive(std::istream & is, unsigned int flags = 0) :
-        detail::polymorphic_iarchive_dispatch<naked_xml_iarchive>(is, flags)
+        detail::polymorphic_iarchive_route<naked_xml_iarchive>(is, flags)
     {}
     ~polymorphic_xml_iarchive(){}
 };

Modified: branches/release/boost/archive/polymorphic_xml_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_xml_oarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_xml_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,12 +18,12 @@
 
 #include <boost/config.hpp>
 #include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/detail/polymorphic_oarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_oarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
-typedef detail::polymorphic_oarchive_dispatch<
+typedef detail::polymorphic_oarchive_route<
     xml_oarchive_impl<naked_xml_oarchive> 
 > polymorphic_xml_oarchive;
 

Modified: branches/release/boost/archive/polymorphic_xml_wiarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_xml_wiarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_xml_wiarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,12 +22,12 @@
 #else
 
 #include <boost/archive/xml_wiarchive.hpp>
-#include <boost/archive/detail/polymorphic_iarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
-typedef detail::polymorphic_iarchive_dispatch<
+typedef detail::polymorphic_iarchive_route<
         xml_wiarchive_impl<naked_xml_wiarchive> 
 > polymorphic_xml_wiarchive;
 

Modified: branches/release/boost/archive/polymorphic_xml_woarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_xml_woarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_xml_woarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,12 +22,12 @@
 #else
 
 #include <boost/archive/xml_woarchive.hpp>
-#include <boost/archive/detail/polymorphic_oarchive_dispatch.hpp>
+#include <boost/archive/detail/polymorphic_oarchive_route.hpp>
 
 namespace boost { 
 namespace archive {
 
-typedef detail::polymorphic_oarchive_dispatch<
+typedef detail::polymorphic_oarchive_route<
         xml_woarchive_impl<naked_xml_woarchive> 
 > polymorphic_xml_woarchive;
 

Modified: branches/release/boost/archive/shared_ptr_helper.hpp
==============================================================================
--- branches/release/boost/archive/shared_ptr_helper.hpp	(original)
+++ branches/release/boost/archive/shared_ptr_helper.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -7,7 +7,7 @@
 #endif
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// shared_ptr.hpp: serialization for boost shared pointer
+// shared_ptr_helper.hpp: serialization for boost shared pointer
 
 // (C) Copyright 2004 Robert Ramey and Martin Ecker
 // Use, modification and distribution is subject to the Boost Software
@@ -18,9 +18,11 @@
 
 #include <map>
 #include <list>
+#include <cstddef> // NULL
 
 #include <boost/config.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/serialization/type_info_implementation.hpp>
 #include <boost/serialization/shared_ptr_132.hpp>
 #include <boost/throw_exception.hpp>
 
@@ -87,7 +89,7 @@
     void * object_identifier(T * t) const {
         const boost::serialization::extended_type_info * true_type 
             = boost::serialization::type_info_implementation<T>::type
-                ::get_derived_extended_type_info(*t);
+                ::get_const_instance().get_derived_extended_type_info(*t);
         // note:if this exception is thrown, be sure that derived pointer
         // is either registered or exported.
         if(NULL == true_type)
@@ -97,10 +99,12 @@
                 )
             );
         const boost::serialization::extended_type_info * this_type
-            = boost::serialization::type_info_implementation<T>::type::get_instance();
+            = & boost::serialization::type_info_implementation<T>::type
+                    ::get_const_instance();
         void * vp = void_downcast(*true_type, *this_type, t);
         return vp;
     }
+public:
     template<class T>
     void reset(shared_ptr<T> & s, T * r){
         if(NULL == r){

Modified: branches/release/boost/archive/tmpdir.hpp
==============================================================================
--- branches/release/boost/archive/tmpdir.hpp	(original)
+++ branches/release/boost/archive/tmpdir.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,6 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cstdlib> // getenv
+#include <cstddef> // NULL
 #include <cassert>
 
 #include <boost/config.hpp>

Added: branches/release/boost/archive/xml_archive_exception.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/archive/xml_archive_exception.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,66 @@
+#ifndef BOOST_ARCHIVE_XML_ARCHIVE_EXCEPTION_HPP
+#define BOOST_ARCHIVE_XML_ARCHIVE_EXCEPTION_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// xml_archive_exception.hpp:
+
+// (C) Copyright 2007 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <exception>
+#include <cassert>
+
+#include <boost/archive/archive_exception.hpp>
+
+namespace boost {
+namespace archive {
+
+//////////////////////////////////////////////////////////////////////
+// exceptions thrown by xml archives
+//
+class xml_archive_exception : 
+    public virtual archive_exception
+{
+public:
+    typedef enum {
+        xml_archive_parsing_error,    // see save_register
+        xml_archive_tag_mismatch,
+        xml_archive_tag_name_error
+    } exception_code;
+    exception_code code;
+    xml_archive_exception(exception_code c)
+    {}
+    virtual const char *what( ) const throw( )
+    {
+        const char *msg;
+        switch(code){
+        case xml_archive_parsing_error:
+            msg = "unrecognized XML syntax";
+            break;
+        case xml_archive_tag_mismatch:
+            msg = "XML start/end tag mismatch";
+            break;
+        case xml_archive_tag_name_error:
+            msg = "Invalid XML tag name";
+            break;
+        default:
+            msg = archive_exception::what();
+            break;
+        }
+        return msg;
+    }
+};
+
+}// namespace archive
+}// namespace boost
+
+#endif //BOOST_XML_ARCHIVE_ARCHIVE_EXCEPTION_HPP

Modified: branches/release/boost/archive/xml_wiarchive.hpp
==============================================================================
--- branches/release/boost/archive/xml_wiarchive.hpp	(original)
+++ branches/release/boost/archive/xml_wiarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -88,7 +88,7 @@
 };
 
 // do not derive from the classes below.  If you want to extend this functionality
-// via inhertance, derived from text_iarchive_impl instead.  This will
+// via inhertance, derived from xml_wiarchive_impl instead.  This will
 // preserve correct static polymorphism.
 
 // same as xml_wiarchive below - without the shared_ptr_helper

Modified: branches/release/boost/archive/xml_woarchive.hpp
==============================================================================
--- branches/release/boost/archive/xml_woarchive.hpp	(original)
+++ branches/release/boost/archive/xml_woarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -39,11 +39,13 @@
 namespace boost {
 namespace archive {
 
+#if 0
 BOOST_WARCHIVE_DECL(std::wostream &)
 operator<<(std::wostream &os, const char *t);
 
 BOOST_WARCHIVE_DECL(std::wostream &)
 operator<<(std::wostream &os, const char t);
+#endif
 
 template<class Archive>
 class xml_woarchive_impl : 

Modified: branches/release/boost/mpi/communicator.hpp
==============================================================================
--- branches/release/boost/mpi/communicator.hpp	(original)
+++ branches/release/boost/mpi/communicator.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1141,7 +1141,7 @@
 {
   BOOST_MPI_CHECK_RESULT(MPI_Send,
                          (const_cast<T*>(values), n, 
-						  get_mpi_datatype<T>(*values),
+                          get_mpi_datatype<T>(*values),
                           dest, tag, MPI_Comm(*this)));
 }
 
@@ -1174,7 +1174,7 @@
 
   BOOST_MPI_CHECK_RESULT(MPI_Recv,
                          (const_cast<T*>(&value), 1, 
-						  get_mpi_datatype<T>(value),
+                          get_mpi_datatype<T>(value),
                           source, tag, MPI_Comm(*this), &stat.m_status));
   return stat;
 }
@@ -1209,7 +1209,7 @@
   status stat;
   BOOST_MPI_CHECK_RESULT(MPI_Recv,
                          (const_cast<T*>(values), n, 
-						  get_mpi_datatype<T>(*values),
+                          get_mpi_datatype<T>(*values),
                           source, tag, MPI_Comm(*this), &stat.m_status));
   return stat;
 }
@@ -1256,7 +1256,7 @@
   request req;
   BOOST_MPI_CHECK_RESULT(MPI_Isend,
                          (const_cast<T*>(&value), 1, 
-						  get_mpi_datatype<T>(value),
+                          get_mpi_datatype<T>(value),
                           dest, tag, MPI_Comm(*this), &req.m_requests[0]));
   return req;
 }
@@ -1291,7 +1291,7 @@
   request req;
   BOOST_MPI_CHECK_RESULT(MPI_Isend,
                          (const_cast<T*>(values), n, 
-						  get_mpi_datatype<T>(*values),
+                          get_mpi_datatype<T>(*values),
                           dest, tag, MPI_Comm(*this), &req.m_requests[0]));
   return req;
 }
@@ -1531,7 +1531,7 @@
   request req;
   BOOST_MPI_CHECK_RESULT(MPI_Irecv,
                          (const_cast<T*>(&value), 1, 
-						  get_mpi_datatype<T>(value),
+                          get_mpi_datatype<T>(value),
                           source, tag, MPI_Comm(*this), &req.m_requests[0]));
   return req;
 }
@@ -1548,7 +1548,7 @@
 
   BOOST_MPI_CHECK_RESULT(MPI_Irecv,
                          (&data->count, 1, 
-						  get_mpi_datatype<std::size_t>(data->count),
+                          get_mpi_datatype<std::size_t>(data->count),
                           source, tag, MPI_Comm(*this), &req.m_requests[0]));
   
   return req;
@@ -1569,7 +1569,7 @@
   request req;
   BOOST_MPI_CHECK_RESULT(MPI_Irecv,
                          (const_cast<T*>(values), n, 
-						  get_mpi_datatype<T>(*values),
+                          get_mpi_datatype<T>(*values),
                           source, tag, MPI_Comm(*this), &req.m_requests[0]));
   return req;
 }
@@ -1587,7 +1587,7 @@
 
   BOOST_MPI_CHECK_RESULT(MPI_Irecv,
                          (&data->count, 1, 
-						  get_mpi_datatype<std::size_t>(data->count),
+                          get_mpi_datatype<std::size_t>(data->count),
                           source, tag, MPI_Comm(*this), &req.m_requests[0]));
 
   return req;

Modified: branches/release/boost/mpi/config.hpp
==============================================================================
--- branches/release/boost/mpi/config.hpp	(original)
+++ branches/release/boost/mpi/config.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -20,6 +20,11 @@
 #include <mpi.h>
 #include <boost/config.hpp>
 
+/** @brief Define this macro to avoid expensice MPI_Pack/Unpack calls on 
+ *  homogeneous machines.
+*/
+//#define BOOST_MPI_HOMOGENEOUS
+
 // If this is an MPI-2 implementation, define configuration macros for
 // the features we are interested in.
 #if defined(MPI_VERSION) && MPI_VERSION == 2

Modified: branches/release/boost/mpi/datatype.hpp
==============================================================================
--- branches/release/boost/mpi/datatype.hpp	(original)
+++ branches/release/boost/mpi/datatype.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -23,6 +23,7 @@
 #include <boost/config.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/or.hpp>
+#include <boost/mpl/and.hpp>
 #include <boost/mpi/detail/mpi_datatype_cache.hpp>
 #include <boost/mpl/assert.hpp>
 #include <utility> // for std::pair
@@ -199,6 +200,9 @@
 {}
 
 /// INTERNAL ONLY
+BOOST_MPI_DATATYPE(packed, MPI_PACKED, builtin);
+
+/// INTERNAL ONLY
 BOOST_MPI_DATATYPE(char, MPI_CHAR, builtin);
 
 /// INTERNAL ONLY
@@ -252,6 +256,13 @@
 BOOST_MPI_DATATYPE(std::pair<BOOST_MPI_LIST2(int, int>), MPI_2INT, builtin);
 #undef BOOST_MPI_LIST2
 
+/// specialization of is_mpi_datatype for pairs
+template <class T, class U>
+struct is_mpi_datatype<std::pair<T,U> >
+ : public mpl::and_<is_mpi_datatype<T>,is_mpi_datatype<U> >
+{
+};
+
 // Define wchar_t specialization of is_mpi_datatype, if possible.
 #if !defined(BOOST_NO_INTRINSIC_WCHAR_T) && \
   (defined(MPI_WCHAR) || (defined(MPI_VERSION) && MPI_VERSION >= 2))
@@ -314,11 +325,16 @@
   : boost::mpl::bool_<true>
 {};
 
-/// INTERNAL ONLY
-template<typename T, typename U>
-struct is_mpi_datatype<std::pair<T, U> >
-  : mpl::and_<is_mpi_datatype<T>, is_mpi_datatype<U> > { };
-
 } } // end namespace boost::mpi
 
+// define a macro to make explicit designation of this more transparent
+#define BOOST_IS_MPI_DATATYPE(T)              \
+namespace boost {                             \
+namespace mpi {                               \
+template<>                                    \
+struct is_mpi_datatype< T > : mpl::true_ {};  \
+}}                                            \
+/**/
+
+
 #endif // BOOST_MPI_MPI_DATATYPE_HPP

Modified: branches/release/boost/mpi/datatype_fwd.hpp
==============================================================================
--- branches/release/boost/mpi/datatype_fwd.hpp	(original)
+++ branches/release/boost/mpi/datatype_fwd.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -27,6 +27,8 @@
 template<typename T> struct is_mpi_datatype;
 template<typename T> MPI_Datatype get_mpi_datatype(const T& x = T());
 
+/// a dummy data type giving MPI_PACKED as its MPI_Datatype
+struct packed {};
 } } // end namespace boost::mpi
 
 #endif // BOOST_MPI_MPI_DATATYPE_FWD_HPP

Added: branches/release/boost/mpi/detail/binary_buffer_iprimitive.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/mpi/detail/binary_buffer_iprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,122 @@
+// (C) Copyright 2005-2007 Matthias Troyer
+
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  Authors: Matthias Troyer
+
+#ifndef BOOST_MPI_BINARY_BUFFER_IPRIMITIVE_HPP
+#define BOOST_MPI_BINARY_BUFFER_IPRIMITIVE_HPP
+
+#include <mpi.h>
+#include <iostream>
+#include <cstddef> // size_t
+#include <boost/config.hpp>
+#include <boost/mpi/exception.hpp>
+#include <boost/assert.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/serialization/array.hpp>
+#include <boost/serialization/is_bitwise_serializable.hpp>
+#include <vector>
+#include <boost/mpi/allocator.hpp>
+#include <cstring> // for memcpy
+
+namespace boost { namespace mpi {
+
+/// deserialization using MPI_Unpack
+
+class BOOST_MPI_DECL binary_buffer_iprimitive
+{
+public:
+    /// the type of the buffer from which the data is unpacked upon deserialization
+    typedef std::vector<char, allocator<char> > buffer_type;
+
+    binary_buffer_iprimitive(buffer_type & b, MPI_Comm const &, int position = 0)
+     : buffer_(b),
+       position(position)
+    {
+    }
+
+    void* address ()
+    {
+      return &buffer_.front();
+    }
+
+    void const* address () const
+    {
+      return &buffer_.front();
+    }
+
+    const std::size_t& size() const
+    {
+      return size_ = buffer_.size();
+    }
+
+    void resize(std::size_t s)
+    {
+      buffer_.resize(s);
+    }
+
+    void load_binary(void *address, std::size_t count)
+    {
+      load_impl(address,count);
+    }
+
+    // fast saving of arrays of fundamental types
+    template<class T>
+    void load_array(serialization::array<T> const& x, unsigned int /* file_version */)
+    {
+      BOOST_MPL_ASSERT((serialization::is_bitwise_serializable<BOOST_DEDUCED_TYPENAME remove_const<T>::type>));
+      if (x.count())
+        load_impl(x.address(), sizeof(T)*x.count());
+    }
+
+    typedef serialization::is_bitwise_serializable<mpl::_1> use_array_optimization;
+
+    template<class T>
+    void load(serialization::array<T> const& x)
+    {
+      load_array(x,0u);
+    }
+
+    // default saving of primitives.
+    template<class T>
+    void load( T & t)
+    {
+      BOOST_MPL_ASSERT((serialization::is_bitwise_serializable<BOOST_DEDUCED_TYPENAME remove_const<T>::type>));
+      load_impl(&t, sizeof(T));
+    }
+
+    void load( std::string & s)
+    {
+      unsigned int l;
+      load(l);
+      // borland de-allocator fixup
+      #if BOOST_WORKAROUND(_RWSTD_VER, BOOST_TESTED_AT(20101))
+      if(NULL != s.data())
+      #endif
+      s.resize(l);
+      // note breaking a rule here - could be a problem on some platform
+      load_impl(const_cast<char *>(s.data()),l);
+    }
+
+private:
+
+    void load_impl(void * p, int l)
+    {
+      if (position+l > static_cast<int>(buffer_.size()))
+        std::cerr << position << " " << l << " " << buffer_.size() << "\n";
+      assert(position+l<=static_cast<int>(buffer_.size()));
+      std::memcpy(p,&buffer_[position],l);
+      position += l;
+    }
+
+    buffer_type & buffer_;
+    mutable std::size_t size_;
+    int position;
+};
+
+} } // end namespace boost::mpi
+
+#endif // BOOST_MPI_PACKED_IPRIMITIVE_HPP

Added: branches/release/boost/mpi/detail/binary_buffer_oprimitive.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/mpi/detail/binary_buffer_oprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,103 @@
+// (C) Copyright 2005-2007 Matthias Troyer
+
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  Authors: Matthias Troyer
+
+#ifndef BOOST_MPI_BINARY_BUFFER_OPRIMITIVE_HPP
+#define BOOST_MPI_BINARY_BUFFER_OPRIMITIVE_HPP
+
+#include <mpi.h>
+#include <iostream>
+#include <cstddef> // size_t
+#include <boost/config.hpp>
+
+#include <boost/serialization/array.hpp>
+#include <boost/serialization/is_bitwise_serializable.hpp>
+#include <boost/assert.hpp>
+#include <boost/mpl/assert.hpp>
+#include <vector>
+#include <boost/mpi/allocator.hpp>
+#include <boost/mpl/always.hpp>
+#include <boost/type_traits/remove_const.hpp>
+
+namespace boost { namespace mpi {
+
+/// serialization using binary copy into a buffer
+
+class BOOST_MPI_DECL binary_buffer_oprimitive
+{
+public:
+    /// the type of the buffer into which the data is packed upon serialization
+    typedef std::vector<char, allocator<char> > buffer_type;
+
+    binary_buffer_oprimitive(buffer_type & b, MPI_Comm const &)
+     : buffer_(b)
+    {
+    }
+
+    void const * address() const
+    {
+      return &buffer_.front();
+    }
+
+    const std::size_t& size() const
+    {
+      return size_ = buffer_.size();
+    }
+
+    void save_binary(void const *address, std::size_t count)
+    {
+      save_impl(address,count);
+    }
+
+    // fast saving of arrays
+    template<class T>
+    void save_array(serialization::array<T> const& x, unsigned int /* file_version */)
+    {
+    
+      BOOST_MPL_ASSERT((serialization::is_bitwise_serializable<BOOST_DEDUCED_TYPENAME remove_const<T>::type>));
+      if (x.count())
+        save_impl(x.address(), x.count()*sizeof(T));
+    }
+
+    template<class T>
+    void save(serialization::array<T> const& x)
+    {
+      save_array(x,0u);
+    }
+
+    typedef serialization::is_bitwise_serializable<mpl::_1> use_array_optimization;
+
+    // default saving of primitives.
+    template<class T>
+    void save(const T & t)
+    {
+      BOOST_MPL_ASSERT((serialization::is_bitwise_serializable<BOOST_DEDUCED_TYPENAME remove_const<T>::type>));
+      save_impl(&t, sizeof(T));
+    }
+
+    void save(const std::string &s)
+    {
+      unsigned int l = static_cast<unsigned int>(s.size());
+      save(l);
+      save_impl(s.data(),s.size());
+    }
+
+private:
+
+    void save_impl(void const * p, int l)
+    {
+      char const* ptr = reinterpret_cast<char const*>(p);
+      buffer_.insert(buffer_.end(),ptr,ptr+l);
+    }
+
+  buffer_type& buffer_;
+  mutable std::size_t size_;
+};
+
+} } // end namespace boost::mpi
+
+#endif // BOOST_MPI_BINARY_BUFFER_OPRIMITIVE_HPP

Modified: branches/release/boost/mpi/detail/content_oarchive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/content_oarchive.hpp	(original)
+++ branches/release/boost/mpi/detail/content_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -61,5 +61,5 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::content_oarchive)
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::content_oarchive>)
-
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::detail::content_oarchive)
 #endif // BOOST_MPI_DETAIL_CONTENT_OARCHIVE_HPP

Modified: branches/release/boost/mpi/detail/forward_iprimitive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/forward_iprimitive.hpp	(original)
+++ branches/release/boost/mpi/detail/forward_iprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -28,26 +28,26 @@
 
     /// the type of the archive to which the loading of primitive types will be forwarded
     typedef ImplementationArchive implementation_archive_type;
-	
-	/// the constructor takes a reference to the implementation archive used for loading primitve types
+
+    /// the constructor takes a reference to the implementation archive used for loading primitve types
     forward_iprimitive(implementation_archive_type& ar)
-	 : implementation_archive(ar)
+     : implementation_archive(ar)
     {}
 
-	/// binary loading is forwarded to the implementation archive
+    /// binary loading is forwarded to the implementation archive
     void load_binary(void * address, std::size_t count )
-	{
-	  implementation_archive.load_binary(address,count);
-	}
-	
-	/// loading of arrays is forwarded to the implementation archive
+    {
+      implementation_archive.load_binary(address,count);
+    }
+    
+    /// loading of arrays is forwarded to the implementation archive
     template<class T>
     void load_array(serialization::array<T> & x, unsigned int file_version )
     {
-	  implementation_archive.load_array(x,file_version);
+      implementation_archive.load_array(x,file_version);
     }
 
-    typedef typename ImplementationArchive::use_array_optimization use_array_optimization;	
+    typedef typename ImplementationArchive::use_array_optimization use_array_optimization;    
 
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
     friend class archive::load_access;
@@ -60,9 +60,9 @@
     template<class T>
     void load(T & t)
     {
-	  implementation_archive >> t;
+      implementation_archive >> t;
     }
-	
+
 private:
     implementation_archive_type& implementation_archive;
 };

Modified: branches/release/boost/mpi/detail/forward_oprimitive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/forward_oprimitive.hpp	(original)
+++ branches/release/boost/mpi/detail/forward_oprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -29,26 +29,26 @@
 
     /// the type of the archive to which the saving of primitive types will be forwarded
     typedef ImplementationArchive implementation_archive_type;
-	
-	/// the constructor takes a reference to the implementation archive used for saving primitve types
+    
+    /// the constructor takes a reference to the implementation archive used for saving primitve types
     forward_oprimitive(implementation_archive_type& ar)
-	 : implementation_archive(ar)
+     : implementation_archive(ar)
     {}
 
-	/// binary saving is forwarded to the implementation archive
+    /// binary saving is forwarded to the implementation archive
     void save_binary(const void * address, std::size_t count)
-	{
-	  implementation_archive.save_binary(address,count);
-	}
-	
-	/// saving of arrays is forwarded to the implementation archive
+    {
+      implementation_archive.save_binary(address,count);
+    }
+    
+    /// saving of arrays is forwarded to the implementation archive
     template<class T>
     void save_array(serialization::array<T> const& x, unsigned int file_version )
     {
-	  implementation_archive.save_array(x,file_version);
+      implementation_archive.save_array(x,file_version);
     }
 
-    typedef typename ImplementationArchive::use_array_optimization use_array_optimization;	
+    typedef typename ImplementationArchive::use_array_optimization use_array_optimization;
 
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
     friend class archive::save_access;
@@ -61,9 +61,9 @@
     template<class T>
     void save(const T & t)
     {
-	  implementation_archive << t;
+      implementation_archive << t;
     }
-	
+
 private:
     implementation_archive_type& implementation_archive;
 };

Modified: branches/release/boost/mpi/detail/forward_skeleton_iarchive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/forward_skeleton_iarchive.hpp	(original)
+++ branches/release/boost/mpi/detail/forward_skeleton_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -14,26 +14,25 @@
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/iserializer.hpp>
 #include <boost/archive/detail/interface_iarchive.hpp>
-#include <boost/archive/array/iarchive.hpp>
+#include <boost/archive/detail/common_iarchive.hpp>
 #include <boost/serialization/collection_size_type.hpp>
-#include <boost/archive/array/iarchive.hpp>
 
 namespace boost { namespace mpi { namespace detail {
 
 template<class Archive, class ImplementationArchive>
 class forward_skeleton_iarchive 
-  : public archive::array::iarchive<Archive>
+  : public archive::detail::common_iarchive<Archive>
 {
 public:
 
     typedef ImplementationArchive implementation_archive_type;
-	
+
     forward_skeleton_iarchive(implementation_archive_type& ar) 
-	  : archive::array::iarchive<Archive>(archive::no_header),
-	    implementation_archive(ar)
-	{
-	}
-		
+      : archive::detail::common_iarchive<Archive>(archive::no_header),
+        implementation_archive(ar)
+    {
+    }
+
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
@@ -50,12 +49,12 @@
     {
         archive::load(* this->This(), t);
     }
-	
+
 #define BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(T) \
     void load_override(T & t , int)             \
-	{                                           \
-	  implementation_archive >> t;              \
-	}
+    {                                           \
+      implementation_archive >> t;              \
+    }
 
 BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::class_id_optional_type)
 BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::version_type)

Modified: branches/release/boost/mpi/detail/forward_skeleton_oarchive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/forward_skeleton_oarchive.hpp	(original)
+++ branches/release/boost/mpi/detail/forward_skeleton_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -14,26 +14,25 @@
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/oserializer.hpp>
 #include <boost/archive/detail/interface_oarchive.hpp>
-#include <boost/archive/array/oarchive.hpp>
+#include <boost/archive/detail/common_oarchive.hpp>
 #include <boost/serialization/collection_size_type.hpp>
-#include <boost/archive/array/oarchive.hpp>
 
 namespace boost { namespace mpi { namespace detail {
 
 template<class Archive, class ImplementationArchive>
 class forward_skeleton_oarchive 
-  : public archive::array::oarchive<Archive>
+  : public archive::detail::common_oarchive<Archive>
 {
 public:
 
     typedef ImplementationArchive implementation_archive_type;
-	
+
     forward_skeleton_oarchive(implementation_archive_type& ar) 
-	  : archive::array::oarchive<Archive>(archive::no_header),
-		implementation_archive(ar)
-	{
-	}
-		
+      : archive::detail::common_oarchive<Archive>(archive::no_header),
+        implementation_archive(ar)
+    {
+    }
+
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
@@ -50,12 +49,12 @@
     {
         archive::save(* this->This(), t);
     }
-	
+
 #define BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(T) \
     void save_override(T const & t , int)       \
-	{                                           \
-	  implementation_archive << t;              \
-	}
+    {                                           \
+      implementation_archive << t;              \
+    }
 
 BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::class_id_optional_type)
 BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::version_type)

Modified: branches/release/boost/mpi/detail/ignore_skeleton_oarchive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/ignore_skeleton_oarchive.hpp	(original)
+++ branches/release/boost/mpi/detail/ignore_skeleton_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -12,7 +12,7 @@
 #include <boost/pfto.hpp>
 
 #include <boost/archive/detail/auto_link_archive.hpp>
-#include <boost/archive/array/oarchive.hpp>
+#include <boost/archive/detail/common_oarchive.hpp>
 #include <boost/archive/basic_archive.hpp>
 #include <boost/archive/detail/oserializer.hpp>
 #include <boost/serialization/collection_size_type.hpp>
@@ -21,15 +21,14 @@
 
 template<class Archive>
 class ignore_skeleton_oarchive 
-  : public archive::array::oarchive<Archive>
+  : public archive::detail::common_oarchive<Archive>
 {
 public:
-	
     ignore_skeleton_oarchive()
-	  : archive::array::oarchive<Archive>(archive::no_header)
-	{
-	}
-		
+      : archive::detail::common_oarchive<Archive>(archive::no_header)
+    {
+    }
+
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
@@ -46,10 +45,10 @@
     {
         archive::save(* this->This(), t);
     }
-	
+
 #define BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(T) \
     void save_override(T const & , int)        \
-	{}
+    {}
 
 BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(archive::class_id_optional_type)
 BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(archive::version_type)

Modified: branches/release/boost/mpi/detail/mpi_datatype_cache.hpp
==============================================================================
--- branches/release/boost/mpi/detail/mpi_datatype_cache.hpp	(original)
+++ branches/release/boost/mpi/detail/mpi_datatype_cache.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -69,12 +69,12 @@
 
     // check whether the type already exists
     std::type_info const* t = &typeid(T);
-	MPI_Datatype datatype = get(t);
-	if (datatype == MPI_DATATYPE_NULL) {
+    MPI_Datatype datatype = get(t);
+    if (datatype == MPI_DATATYPE_NULL) {
       // need to create a type
       mpi_datatype_oarchive ar(x);
-	  datatype = ar.get_mpi_datatype();
-	  set(t, datatype);
+      datatype = ar.get_mpi_datatype();
+      set(t, datatype);
     }
 
     return datatype;

Modified: branches/release/boost/mpi/detail/mpi_datatype_oarchive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/mpi_datatype_oarchive.hpp	(original)
+++ branches/release/boost/mpi/detail/mpi_datatype_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -43,5 +43,6 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::mpi_datatype_oarchive)
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::mpi_datatype_oarchive>)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::detail::mpi_datatype_oarchive)
 
 #endif // BOOST_MPI_DETAIL_MPI_DATATYPE_OARCHIVE_HPP

Modified: branches/release/boost/mpi/detail/packed_iprimitive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/packed_iprimitive.hpp	(original)
+++ branches/release/boost/mpi/detail/packed_iprimitive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -65,20 +65,19 @@
 
     // fast saving of arrays of fundamental types
     template<class T>
-    void load_array(serialization::array<T> & x, unsigned int /* file_version */)
+    void load_array(serialization::array<T> const& x, unsigned int /* file_version */)
     {
       if (x.count())
         load_impl(x.address(), get_mpi_datatype(*x.address()), x.count());
     }
 
-    typedef is_mpi_datatype<mpl::_1> use_array_optimization;
+    template<class T>
+    void load(serialization::array<T> const& x)
+    {
+      load_array(x,0u);
+    }
 
-#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-    friend class archive::load_access;
-protected:
-#else
-public:
-#endif
+    typedef is_mpi_datatype<mpl::_1> use_array_optimization;
 
     // default saving of primitives.
     template<class T>

Modified: branches/release/boost/mpi/detail/text_skeleton_oarchive.hpp
==============================================================================
--- branches/release/boost/mpi/detail/text_skeleton_oarchive.hpp	(original)
+++ branches/release/boost/mpi/detail/text_skeleton_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,6 @@
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/mpi/detail/forward_skeleton_oarchive.hpp>
 #include <boost/mpi/detail/ignore_oprimitive.hpp>
-#include <boost/archive/array/oarchive.hpp>
 
 namespace boost { namespace mpi {
 
@@ -25,9 +24,9 @@
 {
 public:
     text_skeleton_oarchive(std::ostream & s, unsigned int flags = 0) 
-	 : detail::forward_skeleton_oarchive<text_skeleton_oarchive,boost::archive::text_oarchive>(skeleton_archive_)
+     : detail::forward_skeleton_oarchive<text_skeleton_oarchive,boost::archive::text_oarchive>(skeleton_archive_)
      , skeleton_archive_(s,flags)
-	{}
+    {}
 
 private:
     boost::archive::text_oarchive skeleton_archive_;

Modified: branches/release/boost/mpi/packed_iarchive.hpp
==============================================================================
--- branches/release/boost/mpi/packed_iarchive.hpp	(original)
+++ branches/release/boost/mpi/packed_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -23,10 +23,17 @@
 #include <boost/archive/basic_binary_iarchive.hpp>
 #include <boost/archive/shared_ptr_helper.hpp>
 #include <boost/mpi/detail/packed_iprimitive.hpp>
+#include <boost/mpi/detail/binary_buffer_iprimitive.hpp>
 #include <boost/assert.hpp>
 
 namespace boost { namespace mpi {
 
+#ifdef BOOST_MPI_HOMOGENEOUS
+  typedef binary_buffer_iprimitive iprimitive;
+#else
+  typedef packed_iprimitive iprimitive;
+#endif
+
 /** @brief An archive that packs binary data into an MPI buffer.
  *
  *  The @c packed_iarchive class is an Archiver (as in the
@@ -36,7 +43,7 @@
  *  implementation to perform serialization.
  */
 class BOOST_MPI_DECL packed_iarchive
-  : public packed_iprimitive
+  : public iprimitive
   , public archive::basic_binary_iarchive<packed_iarchive>
   , public archive::detail::shared_ptr_helper
 {
@@ -59,7 +66,7 @@
    *  deserialization will begin.
    */
   packed_iarchive(MPI_Comm const & comm, buffer_type & b, unsigned int flags = boost::archive::no_header, int position = 0)
-        : packed_iprimitive(b,comm,position),
+        : iprimitive(b,comm,position),
           archive::basic_binary_iarchive<packed_iarchive>(flags)
         {}
 
@@ -70,16 +77,44 @@
    *  @param comm The communicator over which this archive will be
    *  sent.
    *
+   *  @param s The size of the buffer to be received.
+   *
    *  @param flags Control the serialization of the data types. Refer
    *  to the Boost.Serialization documentation before changing the
    *  default flags.
    */
   packed_iarchive
-          ( MPI_Comm const & comm , unsigned int flags = boost::archive::no_header)
-         : packed_iprimitive(internal_buffer_,comm),
-           archive::basic_binary_iarchive<packed_iarchive>(flags)
+          ( MPI_Comm const & comm , std::size_t s=0, 
+           unsigned int flags = boost::archive::no_header)
+         : iprimitive(internal_buffer_,comm)
+         , archive::basic_binary_iarchive<packed_iarchive>(flags)
+         , internal_buffer_(s)
         {}
 
+  // Load everything else in the usual way, forwarding on to the Base class
+  template<class T>
+  void load_override(T& x, int version, mpl::false_)
+  {
+    archive::basic_binary_iarchive<packed_iarchive>::load_override(x,version);
+  }
+
+  // Load it directly using the primnivites
+  template<class T>
+  void load_override(T& x, int version, mpl::true_)
+  {
+    iprimitive::load(x);
+  }
+
+  // Load all supported datatypes directly
+  template<class T>
+  void load_override(T& x, int version)
+  {
+    typedef typename mpl::apply1<use_array_optimization
+      , BOOST_DEDUCED_TYPENAME remove_const<T>::type
+    >::type use_optimized;
+    load_override(x, version, use_optimized());
+  }
+
 private:
   /// An internal buffer to be used when the user does not supply his
   /// own buffer.
@@ -90,5 +125,6 @@
 
 BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(boost::mpi::packed_iarchive)
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::packed_iarchive)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::packed_iarchive)
 
 #endif // BOOST_MPI_PACKED_IARCHIVE_HPP

Modified: branches/release/boost/mpi/packed_oarchive.hpp
==============================================================================
--- branches/release/boost/mpi/packed_oarchive.hpp	(original)
+++ branches/release/boost/mpi/packed_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,9 +22,16 @@
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/basic_binary_oarchive.hpp>
 #include <boost/mpi/detail/packed_oprimitive.hpp>
+#include <boost/mpi/detail/binary_buffer_oprimitive.hpp>
 
 namespace boost { namespace mpi {
 
+#ifdef BOOST_MPI_HOMOGENEOUS
+  typedef binary_buffer_oprimitive oprimitive;
+#else
+  typedef packed_oprimitive oprimitive;
+#endif
+
 /** @brief An archive that unpacks binary data from an MPI buffer.
  *
  *  The @c packed_oarchive class is an Archiver (as in the
@@ -33,8 +40,9 @@
  *  type and will use the @c MPI_Unpack function of the underlying MPI
  *  implementation to perform deserialization.
  */
+  
 class BOOST_MPI_DECL packed_oarchive
-  : public packed_oprimitive,
+  : public oprimitive,
     public archive::basic_binary_oarchive<packed_oarchive>
 {
 public:
@@ -53,7 +61,7 @@
    *  default flags.
    */
   packed_oarchive( MPI_Comm const & comm, buffer_type & b, unsigned int flags = boost::archive::no_header)
-         : packed_oprimitive(b,comm),
+         : oprimitive(b,comm),
            archive::basic_binary_oarchive<packed_oarchive>(flags)
         {}
 
@@ -69,10 +77,31 @@
    *  default flags.
    */
   packed_oarchive ( MPI_Comm const & comm, unsigned int flags =  boost::archive::no_header)
-         : packed_oprimitive(internal_buffer_,comm),
+         : oprimitive(internal_buffer_,comm),
            archive::basic_binary_oarchive<packed_oarchive>(flags)
         {}
 
+  // Save everything else in the usual way, forwarding on to the Base class
+  template<class T>
+  void save_override(T const& x, int version, mpl::false_)
+  {
+    archive::basic_binary_oarchive<packed_oarchive>::save_override(x,version);
+  }
+
+  // Save it directly using the primnivites
+  template<class T>
+  void save_override(T const& x, int version, mpl::true_)
+  {
+    oprimitive::save(x);
+  }
+
+  // Save all supported datatypes directly
+  template<class T>
+  void save_override(T const& x, int version)
+  {
+    typedef typename mpl::apply1<use_array_optimization,T>::type use_optimized;
+    save_override(x, version, use_optimized());
+  }
 
 private:
   /// An internal buffer to be used when the user does not supply his
@@ -84,6 +113,8 @@
 
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::packed_oarchive)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::packed_oarchive)
+
 
 
 #endif // BOOST_MPI_PACKED_OARCHIVE_HPP

Modified: branches/release/boost/mpi/skeleton_and_content.hpp
==============================================================================
--- branches/release/boost/mpi/skeleton_and_content.hpp	(original)
+++ branches/release/boost/mpi/skeleton_and_content.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -385,4 +385,7 @@
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::type1)
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::mpi::detail::type2)
 
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::packed_skeleton_oarchive)
+BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::mpi::packed_skeleton_iarchive)
+
 #endif // BOOST_MPI_SKELETON_AND_CONTENT_HPP

Modified: branches/release/boost/mpi/status.hpp
==============================================================================
--- branches/release/boost/mpi/status.hpp	(original)
+++ branches/release/boost/mpi/status.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -34,6 +34,8 @@
 {
  public:
   status() : m_count(-1) { }
+  
+  status(MPI_Status const& s) : m_status(s), m_count(-1) {}
 
   /**
    * Retrieve the source of the message.

Modified: branches/release/boost/serialization/array.hpp
==============================================================================
--- branches/release/boost/serialization/array.hpp	(original)
+++ branches/release/boost/serialization/array.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -7,15 +7,31 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
+#include <boost/serialization/split_member.hpp>
 #include <boost/serialization/wrapper.hpp>
-#include <boost/serialization/collection_size_type.hpp>
-#include <boost/archive/archive_exception.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/mpl/always.hpp>
+#include <boost/mpl/apply.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/type_traits/remove_const.hpp>
+#include <boost/array.hpp>
 #include <iostream>
 
+#include <cstddef> // std::size_t
+#include <cstddef>
+#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{ 
+    using ::size_t; 
+} // namespace std
+#endif
+
 namespace boost { namespace serialization {
 
+// traits to specify whether to use  an optimized array serialization
+
+template <class Archive>
+struct use_array_optimization : boost::mpl::always<boost::mpl::false_> {};
+
 template<class T>
 class array
  : public wrapper_traits<array<T> >
@@ -30,7 +46,7 @@
     
     // default implementation
     template<class Archive>
-    void serialize(Archive &ar, const unsigned int) const
+    void serialize_optimized(Archive &ar, const unsigned int, mpl::false_ ) const
     {
       // default implemention does the loop
       std::size_t c = count();
@@ -38,6 +54,37 @@
       while(0 < c--)
             ar & make_nvp("item", *t++);
     }
+
+    // optimized implementation
+    template<class Archive>
+    void serialize_optimized(Archive &ar, const unsigned int version, mpl::true_ )
+    {
+      boost::serialization::split_member(ar, *this, version);
+    }
+
+    // default implementation
+    template<class Archive>
+    void save(Archive &ar, const unsigned int version) const
+    {
+      ar.save_array(*this,version);
+    }
+
+    // default implementation
+    template<class Archive>
+    void load(Archive &ar, const unsigned int version)
+    {
+      ar.load_array(*this,version);
+    }
+
+    // default implementation
+    template<class Archive>
+    void serialize(Archive &ar, const unsigned int version)
+    {
+      typedef BOOST_DEDUCED_TYPENAME serialization::use_array_optimization<Archive>
+                ::template apply<BOOST_DEDUCED_TYPENAME remove_const<T>::type 
+            >::type use_optimized;
+      serialize_optimized(ar,version,use_optimized());
+    }
     
     value_type* address() const
     {
@@ -64,44 +111,27 @@
     return array<T>(t, s);
 }
 
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// T[N]
 
-/*
+template <class Archive, class T, std::size_t N>
 
-template<class Archive, class U, std::size_t N>
-void save( Archive & ar, U const (& t)[N], const unsigned int file_version )
+void serialize(Archive& ar, boost::array<T,N>& a, const unsigned int version)
 {
-  const serialization::collection_size_type count(N);
-  ar << BOOST_SERIALIZATION_NVP(count);
-  if (N)
-    ar << serialization::make_array(&t[0],N);
+  ar & make_nvp("elems",a.elems);
 }
 
-template<class Archive, class U, std::size_t N>
-void load( Archive & ar, U (& t)[N], const unsigned int file_version )
-{
-  serialization::collection_size_type count;
-  ar >> BOOST_SERIALIZATION_NVP(count);
-  if(count > N)
-      boost::throw_exception(archive::archive_exception(
-        boost::archive::archive_exception::array_size_too_short
-      ));
-  if (N)
-    ar >> serialization::make_array(&t[0],count);
-}
 
 
-// split non-intrusive serialization function member into separate
-// non intrusive save/load member functions
-template<class Archive, class U, std::size_t N>
-inline void serialize( Archive & ar, U (& t)[N], const unsigned int file_version)
-{
-    boost::serialization::split_free(ar, t, file_version);
-}
-*/
+} } // end namespace boost::serialization
 
 
-} } // end namespace boost::serialization
+#define BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(Archive)           \
+namespace boost { namespace serialization {                           \
+template <> struct use_array_optimization<Archive> {                  \
+  template <class ValueType>                                          \
+  struct apply : boost::mpl::apply1<Archive::use_array_optimization   \
+      , BOOST_DEDUCED_TYPENAME boost::remove_const<ValueType>::type   \
+    >::type {};                                                       \
+}; }}
+
 
 #endif //BOOST_SERIALIZATION_ARRAY_HPP

Added: branches/release/boost/serialization/assume_abstract.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/serialization/assume_abstract.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,59 @@
+#ifndef BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP
+#define BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// is_abstract_class.hpp:
+
+// (C) Copyright 2008 Robert Ramey
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+// this is useful for compilers which don't support the boost::is_abstract
+
+#include <boost/type_traits/is_abstract.hpp>
+
+#ifndef BOOST_NO_IS_ABSTRACT
+
+// if there is an intrinsic is_abstract defined, we don't have to do anything
+#define BOOST_SERIALIZATION_ASSUME_ABSTRACT(T)
+
+// but forward to the "official" is_abstract
+namespace boost {
+namespace serialization {
+    template<class T>
+    struct is_abstract : boost::is_abstract<T> {} ;
+} // namespace serialization
+} // namespace boost
+
+#else
+// we have to "make" one
+
+namespace boost {
+namespace serialization {
+    template<class T>
+    struct is_abstract : boost::false_type {};
+} // namespace serialization
+} // namespace boost
+
+// define a macro to make explicit designation of this more transparent
+#define BOOST_SERIALIZATION_ASSUME_ABSTRACT(T)        \
+namespace boost {                                     \
+namespace serialization {                             \
+template<>                                            \
+struct is_abstract< T > : boost::true_type {};        \
+template<>                                            \
+struct is_abstract< const T > : boost::true_type {};  \
+}}                                                    \
+/**/
+
+#endif // BOOST_NO_IS_ABSTRACT
+
+#endif //BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP

Modified: branches/release/boost/serialization/base_object.hpp
==============================================================================
--- branches/release/boost/serialization/base_object.hpp	(original)
+++ branches/release/boost/serialization/base_object.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -25,12 +25,15 @@
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/int.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/mpl/identity.hpp>
+
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/type_traits/is_pointer.hpp>
 #include <boost/type_traits/is_const.hpp>
+#include <boost/type_traits/is_polymorphic.hpp>
 
 #include <boost/static_assert.hpp>
-#include <boost/serialization/type_info_implementation.hpp>
 #include <boost/serialization/force_include.hpp>
 #include <boost/serialization/void_cast_fwd.hpp>
 
@@ -39,40 +42,44 @@
 
 namespace detail
 {
-// only register void casts if the types are polymorphic
-  template<class Base, class Derived>
-  struct base_register
-  {
-      static void const* execute(mpl::false_) { return 0; }
-
-      static void const* execute(mpl::true_)
-      {
-          return &void_cast_register((Derived const*)0, (Base const*)0);
-      }
-            
-      static void const* invoke()
-      {
-          typedef mpl::bool_<
-              type_info_implementation<Base>::type::is_polymorphic::value
-          > is_polymorphic;
-          
-          return execute(is_polymorphic());
-      }
-  };
-
-  // get the base type for a given derived type
-  // preserving the const-ness
-  template<class B, class D>
-  struct base_cast
-  {
-      typedef BOOST_DEDUCED_TYPENAME
-      mpl::if_<
-          is_const<D>,
-          const B,
-          B
-      >::type type;
-      BOOST_STATIC_ASSERT(is_const<type>::value == is_const<D>::value);
-  };
+    // get the base type for a given derived type
+    // preserving the const-ness
+    template<class B, class D>
+    struct base_cast
+    {
+        typedef BOOST_DEDUCED_TYPENAME
+        mpl::if_<
+            is_const<D>,
+            const B,
+            B
+        >::type type;
+        BOOST_STATIC_ASSERT(is_const<type>::value == is_const<D>::value);
+    };
+
+    // only register void casts if the types are polymorphic
+    template<class Base, class Derived>
+    struct base_register
+    {
+        struct polymorphic {
+            static void const * invoke(){
+                return &void_cast_register((Derived const*)0, (Base const*)0);
+            }
+        };
+        struct non_polymorphic {
+            static void const * invoke(){
+                return 0;
+            }
+        };
+        static void const * invoke(){
+            typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
+                is_polymorphic<Base>,
+                mpl::identity<polymorphic>,
+                mpl::identity<non_polymorphic>
+            >::type type;
+            return type::invoke();
+        }
+    };
+
 } // namespace detail
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x560))

Modified: branches/release/boost/serialization/binary_object.hpp
==============================================================================
--- branches/release/boost/serialization/binary_object.hpp	(original)
+++ branches/release/boost/serialization/binary_object.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -76,8 +76,6 @@
  : public mpl::true_
 {};
 
-
-
 } // namespace serialization
 } // boost
 

Modified: branches/release/boost/serialization/collection_traits.hpp
==============================================================================
--- branches/release/boost/serialization/collection_traits.hpp	(original)
+++ branches/release/boost/serialization/collection_traits.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -27,6 +27,7 @@
 #include <boost/mpl/integral_c_tag.hpp>
 
 #include <boost/cstdint.hpp>
+#include <climits> // ULONG_MAX
 #include <boost/serialization/level.hpp>
 
 #define BOOST_SERIALIZATION_COLLECTION_TRAITS_HELPER(T, C)          \
@@ -50,10 +51,17 @@
 // i.e. that its not a synonym for (unsigned) long
 // if there is no 64 bit int or if its the same as a long
 // we shouldn't define separate functions for int64 data types.
-#if defined(BOOST_NO_INT64_T) \
-    || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-#   define BOOST_NO_INTRINSIC_INT64_T
-#endif
+#if defined(BOOST_NO_INT64_T)  
+     #define BOOST_NO_INTRINSIC_INT64_T  
+#else   
+    #if defined(ULONG_MAX)  
+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #else   
+        #define BOOST_NO_INTRINSIC_INT64_T  
+    #endif  
+#endif  
 
 #if !defined(BOOST_NO_INTRINSIC_INT64_T)
     #define BOOST_SERIALIZATION_COLLECTION_TRAITS_HELPER_INT64(C)    \

Modified: branches/release/boost/serialization/collections_load_imp.hpp
==============================================================================
--- branches/release/boost/serialization/collections_load_imp.hpp	(original)
+++ branches/release/boost/serialization/collections_load_imp.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -23,16 +23,21 @@
 // helper function templates for serialization of collections
 
 #include <cassert>
-#include <boost/config.hpp>
+#include <cstddef> // size_t
+#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{ 
+    using ::size_t; 
+} // namespace std
+#endif
 #include <boost/detail/workaround.hpp>
 
-#include <boost/aligned_storage.hpp>
-
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/detail/stack_constructor.hpp>
 #include <boost/serialization/collection_size_type.hpp>
 
+
 namespace boost{
 namespace serialization {
 namespace stl {
@@ -59,9 +64,36 @@
     }
 };
 
-// map and set input
+// map input
+template<class Archive, class Container>
+struct archive_input_map
+{
+    inline void operator()(
+        Archive &ar, 
+        Container &s, 
+        const unsigned int v
+    ){
+        typedef BOOST_DEDUCED_TYPENAME Container::value_type type;
+        detail::stack_construct<Archive, type> t(ar, v);
+        // borland fails silently w/o full namespace
+        ar >> boost::serialization::make_nvp("item", t.reference());
+        std::pair<BOOST_DEDUCED_TYPENAME Container::const_iterator, bool> result = 
+            s.insert(t.reference());
+        // note: the following presumes that the map::value_type was NOT tracked
+        // in the archive.  This is the usual case, but here there is no way
+        // to determine that.  
+        if(result.second){
+            ar.reset_object_address(
+                & (result.first->second),
+                & t.reference().second
+            );
+        }
+    }
+};
+
+// multimap input
 template<class Archive, class Container>
-struct archive_input_unique
+struct archive_input_multimap
 {
     inline void operator()(
         Archive &ar, 
@@ -69,7 +101,32 @@
         const unsigned int v
     ){
         typedef BOOST_DEDUCED_TYPENAME Container::value_type type;
-        detail::stack_construct<Archive, type>t(ar, v);
+        detail::stack_construct<Archive, type> t(ar, v);
+        // borland fails silently w/o full namespace
+        ar >> boost::serialization::make_nvp("item", t.reference());
+        BOOST_DEDUCED_TYPENAME Container::const_iterator result 
+            = s.insert(t.reference());
+        // note: the following presumes that the map::value_type was NOT tracked
+        // in the archive.  This is the usual case, but here there is no way
+        // to determine that.  
+        ar.reset_object_address(
+            & result->second,
+            & t.reference()
+        );
+    }
+};
+
+// set input
+template<class Archive, class Container>
+struct archive_input_set
+{
+    inline void operator()(
+        Archive &ar, 
+        Container &s, 
+        const unsigned int v
+    ){
+        typedef BOOST_DEDUCED_TYPENAME Container::value_type type;
+        detail::stack_construct<Archive, type> t(ar, v);
         // borland fails silently w/o full namespace
         ar >> boost::serialization::make_nvp("item", t.reference());
         std::pair<BOOST_DEDUCED_TYPENAME Container::const_iterator, bool> result = 
@@ -79,9 +136,9 @@
     }
 };
 
-// multiset and multimap input
+// multiset input
 template<class Archive, class Container>
-struct archive_input_multi
+struct archive_input_multiset
 {
     inline void operator()(
         Archive &ar, 

Modified: branches/release/boost/serialization/complex.hpp
==============================================================================
--- branches/release/boost/serialization/complex.hpp	(original)
+++ branches/release/boost/serialization/complex.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,61 +22,58 @@
 
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/is_bitwise_serializable.hpp>
+#include <boost/serialization/split_free.hpp>
 
 namespace boost { 
 namespace serialization {
 
-
 template<class Archive, class T>
 inline void serialize(
     Archive & ar,
     std::complex<T> & t,
     const unsigned int file_version 
-)
-{
-  boost::serialization::split_free(ar, t, file_version);
+){
+    boost::serialization::split_free(ar, t, file_version);
 }
 
 template<class Archive, class T>
 inline void save(
     Archive & ar,
-    std::complex<T> const& x,
+    std::complex<T> const& t,
     const unsigned int /* file_version */
-)
-{
-  double re=x.real();
-  double im=x.imag();
-  ar << boost::serialization::make_nvp("real", re);
-  ar << boost::serialization::make_nvp("imag", im);
+){
+    const T re = t.real();
+    const T im = t.imag();
+    ar << boost::serialization::make_nvp("real", re);
+    ar << boost::serialization::make_nvp("imag", im);
 }
 
 template<class Archive, class T>
 inline void load(
     Archive & ar,
-    std::complex<T>& x,
+    std::complex<T>& t,
     const unsigned int /* file_version */ 
-)
-{
-  double re;
-  double im;
-  ar >> boost::serialization::make_nvp("real", re);
-  ar >> boost::serialization::make_nvp("imag", im);
-  x = std::complex<T>(re,im);
+){
+    T re;
+    T im;
+    ar >> boost::serialization::make_nvp("real", re);
+    ar >> boost::serialization::make_nvp("imag", im);
+    t = std::complex<T>(re,im);
 }
 
-/// specialization of serialization traits for complex
+// specialization of serialization traits for complex
 template <class T>
 struct is_bitwise_serializable<std::complex<T> >
- : public is_bitwise_serializable<T> {};
+    : public is_bitwise_serializable<T> {};
 
 template <class T>
 struct implementation_level<std::complex<T> >
- : mpl::int_<object_serializable> {} ;
+    : mpl::int_<object_serializable> {} ;
 
 // treat complex just like builtin arithmetic types for tracking
 template <class T>
 struct tracking_level<std::complex<T> >
- : mpl::int_<track_never> {} ;
+    : mpl::int_<track_never> {} ;
 
 } // serialization
 } // namespace boost

Modified: branches/release/boost/serialization/config.hpp
==============================================================================
--- branches/release/boost/serialization/config.hpp	(original)
+++ branches/release/boost/serialization/config.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,14 +1,8 @@
-#ifndef BOOST_SERIALIZATION_CONFIG_HPP
-#define BOOST_SERIALIZATION_CONFIG_HPP
-
-// MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
+// note lack of include guards.  This is intentional
 
 //  config.hpp  ---------------------------------------------//
 
-//  © Copyright Robert Ramey 2004
+//  (c) Copyright Robert Ramey 2004
 //  Use, modification, and distribution is subject to the Boost Software
 //  License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -28,22 +22,34 @@
 // the same library as BOOST_ARCHIVE.  This could change some day in the
 // future
 
+// if BOOST_SERIALIZATION_DECL is defined undefine it now:
+#ifdef BOOST_SERIALIZATION_DECL
+    #undef BOOST_SERIALIZATION_DECL
+#endif
+
 #ifdef BOOST_HAS_DECLSPEC // defined in config system
 // we need to import/export our code only if the user has specifically
 // asked for it by defining either BOOST_ALL_DYN_LINK if they want all boost
 // libraries to be dynamically linked, or BOOST_SERIALIZATION_DYN_LINK
 // if they want just this one to be dynamically liked:
 #if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK)
-#define BOOST_DYN_LINK
-// export if this is our own source, otherwise import:
-#if defined(BOOST_SERIALIZATION_SOURCE)
-    #if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__)
-    #define BOOST_SERIALIZATION_DECL(T) __declspec(dllexport) T
-    #else
-    #define BOOST_SERIALIZATION_DECL(T) T __declspec(dllexport)
+    #if !defined(BOOST_DYN_LINK)
+        #define BOOST_DYN_LINK
     #endif
-    #pragma message( "BOOST_SERIALIZATION_DECL __declspec(dllexport)" )
-#endif // defined(BOOST_SERIALIZATION_SOURCE)
+    // export if this is our own source, otherwise import:
+    #if defined(BOOST_SERIALIZATION_SOURCE)
+        #if defined(__BORLANDC__)
+            #define BOOST_SERIALIZATION_DECL(T) T __export
+        #else
+            #define BOOST_SERIALIZATION_DECL(T) __declspec(dllexport) T
+        #endif
+    #else
+        #if defined(__BORLANDC__)
+            #define BOOST_SERIALIZATION_DECL(T) T __import
+        #else
+            #define BOOST_SERIALIZATION_DECL(T) __declspec(dllimport) T
+        #endif
+    #endif // defined(BOOST_SERIALIZATION_SOURCE)
 #endif // defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK)
 #endif // BOOST_HAS_DECLSPEC
 
@@ -55,20 +61,22 @@
 //  enable automatic library variant selection  ------------------------------// 
 
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SERIALIZATION_NO_LIB) \
-&& !defined(BOOST_SERIALIZATION_SOURCE) \
-&& !defined(BOOST_ARCHIVE_SOURCE) && !defined(BOOST_WARCHIVE_SOURCE)
-//
-// Set the name of our library, this will get undef'ed by auto_link.hpp
-// once it's done with it:
-//
-#define BOOST_LIB_NAME boost_serialization
-//
-// And include the header that does the work:
-//
-#include <boost/config/auto_link.hpp>
-
-#endif  // !defined(BOOST_SERIALIZATION_SOURCE) && !defined(BOOST_ARCHIVE_SOURCE)
-
-//----------------------------------------------------------------------------// 
+&&  !defined(BOOST_ARCHIVE_SOURCE) && !defined(BOOST_WARCHIVE_SOURCE)  \
+&&  !defined(BOOST_SERIALIZATION_SOURCE)
+    //
+    // Set the name of our library, this will get undef'ed by auto_link.hpp
+    // once it's done with it:
+    //
+    #define BOOST_LIB_NAME boost_serialization
+    //
+    // If we're importing code from a dll, then tell auto_link.hpp about it:
+    //
+    #if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK)
+    #  define BOOST_DYN_LINK
+    #endif
+    //
+    // And include the header that does the work:
+    //
+    #include <boost/config/auto_link.hpp>
 
-#endif // BOOST_SERIALIZATION_CONFIG_HPP
+#endif  

Modified: branches/release/boost/serialization/deque.hpp
==============================================================================
--- branches/release/boost/serialization/deque.hpp	(original)
+++ branches/release/boost/serialization/deque.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -42,7 +42,7 @@
 inline void load(
     Archive & ar,
     std::deque<U, Allocator> &t,
-    const unsigned int file_version
+    const unsigned int /*file_version*/
 ){
     boost::serialization::stl::load_collection<
         Archive,

Modified: branches/release/boost/serialization/detail/shared_count_132.hpp
==============================================================================
--- branches/release/boost/serialization/detail/shared_count_132.hpp	(original)
+++ branches/release/boost/serialization/detail/shared_count_132.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -38,6 +38,13 @@
 #include <typeinfo>         // std::type_info in get_deleter
 #include <cstddef>          // std::size_t
 
+#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{ 
+    using ::size_t; 
+} // namespace std
+#endif
+
 #ifdef __BORLANDC__
 # pragma warn -8026     // Functions with excep. spec. are not expanded inline
 # pragma warn -8027     // Functions containing try are not expanded inline
@@ -45,10 +52,6 @@
 
 namespace boost_132 {
 
-#if !BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x564) ) 
-using namespace boost;
-#endif
-
 // Debug hooks
 
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
@@ -87,19 +90,12 @@
 #endif
 
 namespace detail{
-#if !BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x564) ) 
-using namespace boost::detail;
-#endif
 
 class sp_counted_base
 {
 //private:
 
-#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x564) )
     typedef boost::detail::lightweight_mutex mutex_type;
-#else
-    typedef detail::lightweight_mutex mutex_type;
-#endif
 
 public:
 
@@ -372,7 +368,11 @@
     // auto_ptr<Y> is special cased to provide the strong guarantee
 
     template<class Y>
-    explicit shared_count(std::auto_ptr<Y> & r): pi_(new sp_counted_base_impl< Y *, checked_deleter<Y> >(r.get(), checked_deleter<Y>()))
+    explicit shared_count(std::auto_ptr<Y> & r): pi_(
+        new sp_counted_base_impl<
+            Y *, 
+            boost::checked_deleter<Y>
+        >(r.get(), boost::checked_deleter<Y>()))
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
 #endif
@@ -559,6 +559,8 @@
 
 } // namespace boost
 
+BOOST_SERIALIZATION_ASSUME_ABSTRACT(boost_132::detail::sp_counted_base)
+
 #ifdef __BORLANDC__
 # pragma warn .8027     // Functions containing try are not expanded inline
 # pragma warn .8026     // Functions with excep. spec. are not expanded inline

Modified: branches/release/boost/serialization/detail/shared_ptr_132.hpp
==============================================================================
--- branches/release/boost/serialization/detail/shared_ptr_132.hpp	(original)
+++ branches/release/boost/serialization/detail/shared_ptr_132.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -118,7 +118,7 @@
     typedef T element_type;
     typedef T value_type;
     typedef T * pointer;
-    typedef typename detail::shared_ptr_traits<T>::reference reference;
+    typedef BOOST_DEDUCED_TYPENAME detail::shared_ptr_traits<T>::reference reference;
 
     shared_ptr(): px(0), pn() // never throws in 1.30+
     {

Modified: branches/release/boost/serialization/ephemeral.hpp
==============================================================================
--- branches/release/boost/serialization/ephemeral.hpp	(original)
+++ branches/release/boost/serialization/ephemeral.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,7 +1,8 @@
 #ifndef BOOST_SERIALIZATION_EPHEMERAL_HPP
 #define BOOST_SERIALIZATION_EPHEMERAL_HPP
 
-// MS compatible compilers support #pragma once
+// MS compatible compilers support 
+#pragma once
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif
@@ -9,7 +10,7 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // ephemeral_object.hpp: interface for serialization system.
 
-// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// (C) Copyright 2007 Matthias Troyer. 
 // Use, modification and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/boost/serialization/export.hpp
==============================================================================
--- branches/release/boost/serialization/export.hpp	(original)
+++ branches/release/boost/serialization/export.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -22,20 +22,27 @@
 // that are to be serialized through pointers.
 
 #include <utility>
+#include <cstddef> // NULL
 
 #include <boost/config.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/static_warning.hpp>
 #include <boost/preprocessor/stringize.hpp>
+#include <boost/type_traits/is_polymorphic.hpp>
 
-#include <boost/archive/detail/dynamically_initialized.hpp>
+#ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO   
+    #include <boost/serialization/extended_type_info_typeid.hpp>   
+#endif 
 #include <boost/serialization/type_info_implementation.hpp>
-#include <boost/serialization/is_abstract.hpp>
+#include <boost/serialization/assume_abstract.hpp>
 #include <boost/serialization/force_include.hpp>
+#include <boost/serialization/singleton.hpp>
 
 #include <boost/archive/detail/register_archive.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/not.hpp>
+#include <boost/mpl/bool.hpp>
 
 #include <iostream>
 
@@ -56,51 +63,21 @@
 {
     static const basic_pointer_iserializer &
     enable_load(mpl::true_){
-        return pointer_iserializer<Archive, Serializable>::get_instance();
+        return boost::serialization::singleton<
+            pointer_iserializer<Archive, Serializable> 
+        >::get_const_instance();
     }
 
     static const basic_pointer_oserializer &
     enable_save(mpl::true_){
-        return pointer_oserializer<Archive, Serializable>::get_instance();
+        return boost::serialization::singleton<
+            pointer_oserializer<Archive, Serializable> 
+        >::get_const_instance();
     }
-
     inline static void enable_load(mpl::false_) {}
     inline static void enable_save(mpl::false_) {}
 };
 
-template<class T>
-struct guid_initializer
-{
-    typedef typename
-    boost::serialization::type_info_implementation<T>::type eti_type;
-    
-    static void export_register(const char *key)
-    {
-        eti_type::export_register(key);
-    }
-    
-    static const guid_initializer& get_instance(char const* key)
-    {
-        static guid_initializer const instance(key);
-        return instance;
-    }
-    
-    BOOST_DLLEXPORT guid_initializer(const char *key = 0) BOOST_USED ;
-};
-
-
-template<class T>
-BOOST_DLLEXPORT guid_initializer<T>::guid_initializer(const char *key)
-{
-    if(0 != key)
-        export_register(key);
-
-    // generates the statically-initialized objects whose constructors
-    // register the information allowing serialization of T objects
-    // through pointers to their base classes.
-    instantiate_ptr_serialization((T*)0, 0);
-}
-
 // On many platforms, naming a specialization of this template is
 // enough to cause its argument to be instantiated.
 template <void(*)()>
@@ -109,36 +86,60 @@
 template <class Archive, class Serializable>
 struct ptr_serialization_support
 {
-# ifdef BOOST_MSVC
+# if defined(BOOST_MSVC)
     virtual BOOST_DLLEXPORT void instantiate() BOOST_USED;
-    
-# elif defined(__BORLANDC__)
-    
-    static void instantiate();
+# elif defined(__BORLANDC__)   
+    static BOOST_DLLEXPORT void instantiate() BOOST_USED;
     enum { x = sizeof(instantiate(),3) };
-    
 # else
-    
-    static void instantiate();
+    static BOOST_DLLEXPORT void instantiate() BOOST_USED;
     typedef instantiate_function<
         &ptr_serialization_support::instantiate
     > x;
-
 # endif
 };
 
 template <class Archive, class Serializable>
-BOOST_DLLEXPORT void ptr_serialization_support<Archive,Serializable>::instantiate()
+BOOST_DLLEXPORT void 
+ptr_serialization_support<Archive,Serializable>::instantiate()
 {
-    typedef mpl::not_<serialization::is_abstract<Serializable> > concrete;
-    
     export_impl<Archive,Serializable>::enable_save(
-        mpl::and_<concrete, BOOST_DEDUCED_TYPENAME Archive::is_saving>());
+        BOOST_DEDUCED_TYPENAME Archive::is_saving()
+    );
 
     export_impl<Archive,Serializable>::enable_load(
-        mpl::and_<concrete, BOOST_DEDUCED_TYPENAME Archive::is_loading>());
+        BOOST_DEDUCED_TYPENAME Archive::is_loading()
+    );
 }
 
+template<class T>
+struct guid_initializer
+{  
+    const guid_initializer & export_guid(char const* key, mpl::false_){
+        // generates the statically-initialized objects whose constructors
+        // register the information allowing serialization of T objects
+        // through pointers to their base classes.
+        instantiate_ptr_serialization((T*)0, 0, adl_tag());
+        return *this;
+    }
+    const guid_initializer & export_guid(char const* /*key*/, mpl::true_){
+        return *this;
+    }
+    const guid_initializer & export_guid(char const* key){
+        BOOST_STATIC_WARNING(boost::is_polymorphic<T>::value);
+        assert(NULL != key);
+        boost::serialization::singleton<
+            BOOST_DEDUCED_TYPENAME 
+            boost::serialization::type_info_implementation<T>::type
+        >::get_mutable_instance().key_register(key);
+        // note: exporting an abstract base class will have no effect
+        // and cannot be used to instantitiate serialization code
+        // (one might be using this in a DLL to instantiate code)
+        //BOOST_STATIC_WARNING(! boost::serialization::is_abstract<T>::value);
+        return export_guid(key, boost::serialization::is_abstract<T>());
+    }
+};
+
 } // namespace detail
 } // namespace archive
 } // namespace boost
@@ -146,9 +147,11 @@
 #define BOOST_CLASS_EXPORT_GUID(T, K)                                               \
 namespace                                                                           \
 {                                                                                   \
-    ::boost::archive::detail::guid_initializer< T > const&                          \
+    ::boost::archive::detail::guid_initializer< T > const &                         \
         BOOST_PP_CAT(boost_serialization_guid_initializer_, __LINE__)               \
-          = ::boost::archive::detail::guid_initializer< T >::get_instance(K);       \
+        = ::boost::serialization::singleton<                                        \
+            ::boost::archive::detail::guid_initializer< T >                         \
+          >::get_mutable_instance().export_guid(K);                                 \
 }
 
 // the following is solely to support de-serialization of pointers serialized
@@ -156,9 +159,13 @@
 #define BOOST_CLASS_EXPORT_GUID_1(T, K)                                             \
 namespace                                                                           \
 {                                                                                   \
-    ::boost::archive::detail::guid_initializer< T > const&                          \
-    BOOST_PP_CAT(boost_serialization_guid_initializer_, __LINE__ ## _1)             \
-          = ::boost::archive::detail::guid_initializer< T >::get_instance(K);       \
+    ::boost::archive::detail::guid_initializer< T > const &                         \
+    BOOST_PP_CAT(                                                                   \
+        boost_serialization_guid_initializer_,                                      \
+        BOOST_PP_CAT(__LINE__,_1)                                                   \
+    ) = ::boost::serialization::singleton<                                          \
+            ::boost::archive::detail::guid_initializer< T >                         \
+        >::get_mutable_instance().export_guid(K);                                   \
 }
 
 #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205))
@@ -188,8 +195,7 @@
 // need to export it.
 #define BOOST_CLASS_EXPORT_CHECK(T)                              \
     BOOST_STATIC_WARNING(                                        \
-        boost::serialization::type_info_implementation< T >      \
-            ::type::is_polymorphic::value                        \
+        boost::is_polymorphic<U>::value                          \
     );                                                           \
     /**/
 

Modified: branches/release/boost/serialization/extended_type_info.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info.hpp	(original)
+++ branches/release/boost/serialization/extended_type_info.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,8 +18,10 @@
 
 // for now, extended type info is part of the serialization libraries
 // this could change in the future.
+#include <cstdarg>
+#include <cassert>
+#include <cstddef> // NULL
 #include <boost/config.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/serialization/config.hpp>
 
 #include <boost/config/abi_prefix.hpp> // must be the last header
@@ -33,53 +35,54 @@
 namespace boost { 
 namespace serialization {
 
-class BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) extended_type_info : 
-    private boost::noncopyable 
+class BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) extended_type_info
 {
-private:
-    virtual bool
-    less_than(const extended_type_info &rhs) const = 0;
-    int type_info_key_cmp(const extended_type_info & rhs) const;
-    
+private: 
     // used to uniquely identify the type of class derived from this one
     // so that different derivations of this class can be simultaneously
     // included in implementation of sets and maps.
-    const char * m_type_info_key;
-    // flag to indicate wheter its been registered by type;
-    bool m_self_registered;
-    // flag to indicate wheter its been registered by type;
-    bool m_key_registered;
-    // flag indicating that no virtual function should be called here
-    // this is necessary since it seems that at least one compiler (borland
-    // and one version of gcc call less_than above when erasing even
-    // when given an iterator argument.
-    bool m_is_destructing;
+    const unsigned int m_type_info_key;
+    virtual bool
+    is_less_than(const extended_type_info & /*rhs*/) const {
+        assert(false);
+        return false;
+    };
+    virtual bool
+    is_equal(const extended_type_info & /*rhs*/) const {
+        assert(false);
+        return false;
+    };
+    void key_unregister();
 protected:
     const char * m_key;
-    extended_type_info(const char * type_info_key);
+    // this class can't be used as is. It's just the 
+    // common functionality for all type_info replacement
+    // systems.  Hence, make these protected
+    extended_type_info(const unsigned int type_info_key = 0);
     // account for bogus gcc warning
     #if defined(__GNUC__)
     virtual
     #endif
     ~extended_type_info();
 public:
-    void self_register();
-    void key_register(const char *key);
-    bool is_destructing() const {
-        return m_is_destructing;
+    const char * get_key() const {
+        return m_key;
     }
+    void key_register(const char *key);
     bool operator<(const extended_type_info &rhs) const;
-    bool operator==(const extended_type_info &rhs) const {
-        return this == & rhs;
-    }
+    bool operator==(const extended_type_info &rhs) const;
     bool operator!=(const extended_type_info &rhs) const {
-        return this != & rhs;
-    }
-    const char * get_key() const {
-        return m_key;
+        return !(operator==(rhs));
     }
     static const extended_type_info * find(const char *key);
-    static const extended_type_info * find(const extended_type_info * t);
+    // for plugins
+    virtual void * construct(unsigned int /*count*/ = 0, ...) const {
+        assert(false); // must be implemented if used
+        return NULL;
+    };
+    virtual void destroy(void const * const /*p*/) const {
+        assert(false); // must be implemented if used
+    }
 };
 
 } // namespace serialization 
@@ -88,6 +91,7 @@
 #ifdef BOOST_MSVC
 #pragma warning(pop)
 #endif
+
 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_SERIALIZATION_EXTENDED_TYPE_INFO_HPP

Modified: branches/release/boost/serialization/extended_type_info_no_rtti.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info_no_rtti.hpp	(original)
+++ branches/release/boost/serialization/extended_type_info_no_rtti.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,5 +1,6 @@
 #ifndef BOOST_EXTENDED_TYPE_INFO_NO_RTTI_HPP
 #define BOOST_EXTENDED_TYPE_INFO_NO_RTTI_HPP
+
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // MS compatible compilers support #pragma once
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
@@ -17,12 +18,13 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 #include <cassert>
+
 #include <boost/config.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/type_traits/is_const.hpp>
 
+#include <boost/serialization/singleton.hpp>
 #include <boost/serialization/extended_type_info.hpp>
-#include <boost/mpl/bool.hpp>
+#include <boost/serialization/factory.hpp>
 
 #include <boost/config/abi_prefix.hpp> // must be the last header
 #ifdef BOOST_MSVC
@@ -32,44 +34,37 @@
 
 namespace boost {
 namespace serialization {
-namespace detail {
 ///////////////////////////////////////////////////////////////////////
 // define a special type_info that doesn't depend on rtti which is not
 // available in all situations.
 
+namespace detail {
+
 // common base class to share type_info_key.  This is used to 
 // identify the method used to keep track of the extended type
 class BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) extended_type_info_no_rtti_0 : 
     public extended_type_info
 {
-    virtual bool
-    less_than(const boost::serialization::extended_type_info &rhs) const ;
 protected:
     extended_type_info_no_rtti_0();
-    // account for bogus gcc warning
-    #if defined(__GNUC__)
-    virtual
-    #endif
     ~extended_type_info_no_rtti_0();
 public:
-    struct is_polymorphic
-    {
-        typedef boost::mpl::bool_<true> type;
-        BOOST_STATIC_CONSTANT(bool, value = is_polymorphic::type::value);
-    };
+    virtual bool
+    is_less_than(const boost::serialization::extended_type_info &rhs) const ;
+    virtual bool
+    is_equal(const boost::serialization::extended_type_info &rhs) const ;
 };
 
+} // detail
+
 template<class T>
-class extended_type_info_no_rtti_1 : 
-    public extended_type_info_no_rtti_0
+class extended_type_info_no_rtti : 
+    public detail::extended_type_info_no_rtti_0,
+    public singleton<extended_type_info_no_rtti<T> >
 {
-protected:
-    extended_type_info_no_rtti_1(){}
 public:
-    // note borland complains at making this destructor protected
-    ~extended_type_info_no_rtti_1(){};
-    static const boost::serialization::extended_type_info *
-    get_derived_extended_type_info(const T & t){
+    const extended_type_info *
+    get_derived_extended_type_info(const T & t) const {
         // find the type that corresponds to the most derived type.
         // this implementation doesn't depend on typeid() but assumes
         // that the specified type has a function of the following signature.
@@ -79,30 +74,31 @@
         assert(NULL != derived_key);
         return boost::serialization::extended_type_info::find(derived_key);
     }
-    static boost::serialization::extended_type_info *
-    get_instance(){
-        static extended_type_info_no_rtti_1<T> instance;
-        return & instance;
+    void * construct(unsigned int count, ...) const{
+        // count up the arguments
+        std::va_list ap;
+        va_start(ap, count);
+        switch(count){
+        case 0:
+            return factory<T, 0>(ap);
+        case 1:
+            return factory<T, 1>(ap);
+        case 2:
+            return factory<T, 2>(ap);
+        case 3:
+            return factory<T, 3>(ap);
+        case 4:
+            return factory<T, 4>(ap);
+        default:
+            assert(false); // too many arguments
+            // throw exception here?
+            return NULL;
+        }
     }
-    static void
-    export_register(const char * key){
-        boost::serialization::extended_type_info * eti;
-        eti = get_instance();
-        eti->key_register(key);  // initialize key and add to table
-        eti->self_register();    // add type to type table
+    void destroy(void const * const p) const{
+        delete static_cast<T const *>(p) ;
     }
 };
-} // namespace detail
-
-template<class T>
-class extended_type_info_no_rtti : 
-    public detail::extended_type_info_no_rtti_1<const T>
-{
-    // private constructor to inhibit any existence other than the 
-    // static one
-    extended_type_info_no_rtti(){}
-    ~extended_type_info_no_rtti(){};
-};
 
 } // namespace serialization
 } // namespace boost
@@ -119,14 +115,14 @@
     template<class T>
     struct extended_type_info_impl {
         typedef BOOST_DEDUCED_TYPENAME 
-            boost::serialization::extended_type_info_no_rtti<const T> type;
+            boost::serialization::extended_type_info_no_rtti<T> type;
     };
     } // namespace serialization
     } // namespace boost
 #endif
 
 #ifdef BOOST_MSVC
-#pragma warning(pop)
+#  pragma warning(pop)
 #endif
 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 

Modified: branches/release/boost/serialization/extended_type_info_typeid.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info_typeid.hpp	(original)
+++ branches/release/boost/serialization/extended_type_info_typeid.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,5 +1,6 @@
 #ifndef BOOST_SERIALIZATION_EXTENDED_TYPE_INFO_TYPEID_HPP
 #define BOOST_SERIALIZATION_EXTENDED_TYPE_INFO_TYPEID_HPP
+
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // MS compatible compilers support #pragma once
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
@@ -18,15 +19,18 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <typeinfo>
+#include <cstdarg>
+
 #include <boost/config.hpp>
 
-//#include <boost/static_warning.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/static_warning.hpp>
 #include <boost/type_traits/is_polymorphic.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/preprocessor/stringize.hpp>
+#include <boost/type_traits/remove_const.hpp>
 
+#include <boost/serialization/singleton.hpp>
 #include <boost/serialization/extended_type_info.hpp>
+#include <boost/serialization/factory.hpp>
 
 #include <boost/config/abi_prefix.hpp> // must be the last header
 #ifdef BOOST_MSVC
@@ -36,80 +40,83 @@
 
 namespace boost {
 namespace serialization {
-
 namespace detail {
 
 class BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) extended_type_info_typeid_0 : 
     public extended_type_info
 {
-private:
-    virtual bool
-    less_than(const extended_type_info &rhs) const;
 protected:
-    static const extended_type_info *
-    get_derived_extended_type_info(const std::type_info & ti);
+    const std::type_info * m_ti;
     extended_type_info_typeid_0();
-    // account for bogus gcc warning
-    #if defined(__GNUC__)
-    virtual
-    #endif
     ~extended_type_info_typeid_0();
+    void type_register(const std::type_info & ti);
+    void type_unregister();
+    const extended_type_info *
+    get_extended_type_info(const std::type_info & ti) const;
 public:
-    virtual const std::type_info & get_eti() const = 0;
+    virtual bool
+    is_less_than(const extended_type_info &rhs) const;
+    virtual bool
+    is_equal(const extended_type_info &rhs) const;
+    const std::type_info & get_typeid() const {
+        return *m_ti;
+    }
 };
 
-///////////////////////////////////////////////////////////////////////////////
-// layer to fold T and const T into the same table entry.
+} // namespace detail
+
 template<class T>
-class extended_type_info_typeid_1 : 
-    public detail::extended_type_info_typeid_0
+class extended_type_info_typeid : 
+    public detail::extended_type_info_typeid_0,
+    public singleton<extended_type_info_typeid<T> >
 {
-private:
-    virtual const std::type_info & get_eti() const {
-        return typeid(T);
-    }
-protected:
-    // private constructor to inhibit any existence other than the 
-    // static one
-    extended_type_info_typeid_1() :
+public:
+    extended_type_info_typeid() :
         detail::extended_type_info_typeid_0()
     {
-        self_register();    // add type to type table
+        type_register(typeid(T));
     }
-public:
-    struct is_polymorphic
-    {
-        typedef BOOST_DEDUCED_TYPENAME boost::is_polymorphic<T>::type type;
-        BOOST_STATIC_CONSTANT(bool, value = is_polymorphic::type::value);
-    };
-    static const extended_type_info *
-    get_derived_extended_type_info(const T & t){
+    ~extended_type_info_typeid(){
+        type_unregister();
+    }
+    // get the eti record for the true type of this record
+    // relying upon standard type info implemenation (rtti)
+    const extended_type_info *
+    get_derived_extended_type_info(const T & t) const {
         // note: this implementation - based on usage of typeid (rtti)
-        // only works if the class has at least one virtual function.
-//      BOOST_STATIC_WARNING(
-//          static_cast<bool>(is_polymorphic::value)
-//      );
-        return detail::extended_type_info_typeid_0::get_derived_extended_type_info(typeid(t));
-    }
-    static extended_type_info *
-    get_instance(){
-        static extended_type_info_typeid_1<T> instance;
-        return & instance;
-    }
-    static void
-    export_register(const char * key){
-        get_instance()->key_register(key);
+        // only does something if the class has at least one virtual function.
+        BOOST_STATIC_WARNING(boost::is_polymorphic<T>::value);
+        return 
+            detail::extended_type_info_typeid_0::get_extended_type_info(
+                typeid(t)
+            );
+    }
+    void * construct(unsigned int count, ...) const{
+        // count up the arguments
+        std::va_list ap;
+        va_start(ap, count);
+        switch(count){
+        case 0:
+            return factory<boost::remove_const<T>, 0>(ap);
+        case 1:
+            return factory<boost::remove_const<T>, 1>(ap);
+        case 2:
+            return factory<boost::remove_const<T>, 2>(ap);
+        case 3:
+            return factory<boost::remove_const<T>, 3>(ap);
+        case 4:
+            return factory<boost::remove_const<T>, 4>(ap);
+        default:
+            assert(false); // too many arguments
+            // throw exception here?
+            return NULL;
+        }
+    }
+    void destroy(void const * const p) const{
+        delete static_cast<T const *>(p) ;
     }
 };
 
-} // namespace detail
-
-///////////////////////////////////////////////////////////////////////////////
-template<class T>
-class extended_type_info_typeid : 
-    public detail::extended_type_info_typeid_1<const T>
-{};
-
 } // namespace serialization
 } // namespace boost
 

Added: branches/release/boost/serialization/factory.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/serialization/factory.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,93 @@
+#ifndef BOOST_SERIALIZATION_FACTORY_HPP
+#define BOOST_SERIALIZATION_FACTORY_HPP
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+// factory.hpp: create an instance from an extended_type_info instance.
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <cstdarg>
+#include <cstddef> // NULL
+
+#include <boost/preprocessor/control/if.hpp> 
+#include <boost/preprocessor/comparison/greater.hpp>
+#include <boost/preprocessor/facilities/empty.hpp>
+
+namespace std{
+    #if defined(__LIBCOMO__)
+        using ::va_list;
+    #endif
+} // namespace std
+
+namespace boost {
+namespace serialization {
+
+// default implementation does nothing.
+template<class T, int N>
+T * factory(std::va_list){
+    assert(false);
+    // throw exception here?
+    return NULL;
+}
+
+} // namespace serialization
+} // namespace boost
+
+#define BOOST_SERIALIZATION_FACTORY(N, T, A0, A1, A2, A3) \
+namespace boost {                                         \
+namespace serialization {                                 \
+    template<>                                            \
+    T * factory<T, N>(std::va_list ap){                   \
+        BOOST_PP_IF(BOOST_PP_GREATER(N,0)                 \
+            ,A0 a0 = va_arg(ap, A0);                      \
+        ,BOOST_PP_IF(BOOST_PP_GREATER(N,1)                \
+            ,A1 a1 = va_arg(ap, A1);                      \
+        ,BOOST_PP_IF(BOOST_PP_GREATER(N,2)                \
+            ,A2 a2 = va_arg(ap, A2);                      \
+        ,BOOST_PP_IF(BOOST_PP_GREATER(N,3)                \
+            ,A3 a3 = va_arg(ap, A3);                      \
+            ,BOOST_PP_EMPTY()                             \
+        ))))                                              \
+        return new T(                                     \
+            BOOST_PP_IF(BOOST_PP_GREATER(N,0)             \
+                ,a0                                       \
+            ,BOOST_PP_IF(BOOST_PP_GREATER(N,1)            \
+                ,a1                                       \
+            ,BOOST_PP_IF(BOOST_PP_GREATER(N,2)            \
+                ,a2                                       \
+            ,BOOST_PP_IF(BOOST_PP_GREATER(N,3)            \
+                ,a3                                       \
+                ,BOOST_PP_EMPTY()                         \
+            ))))                                          \
+        );                                                \
+    }                                                     \
+}                                                         \
+}                                                         \
+/**/
+
+#define BOOST_SERIALIZATION_FACTORY_4(T, A0, A1, A2, A3) \
+    BOOST_SERIALIZATION_FACTORY(4, T, A0, A1, A2, A3)
+
+#define BOOST_SERIALIZATION_FACTORY_3(T, A0, A1, A2)     \
+    BOOST_SERIALIZATION_FACTORY(3, T, A0, A1, A2, 0)
+
+#define BOOST_SERIALIZATION_FACTORY_2(T, A0, A1)         \
+    BOOST_SERIALIZATION_FACTORY(2, T, A0, A1, 0, 0)
+
+#define BOOST_SERIALIZATION_FACTORY_1(T, A0)             \
+    BOOST_SERIALIZATION_FACTORY(1, T, A0, 0, 0, 0)
+
+#define BOOST_SERIALIZATION_FACTORY_0(T)                 \
+    BOOST_SERIALIZATION_FACTORY(0, T, 0, 0, 0, 0)
+
+#endif // BOOST_SERIALIZATION_FACTORY_HPP

Modified: branches/release/boost/serialization/force_include.hpp
==============================================================================
--- branches/release/boost/serialization/force_include.hpp	(original)
+++ branches/release/boost/serialization/force_include.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -16,10 +16,6 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-// implementation of class export functionality.  This is an alternative to
-// "forward declaration" method to provoke instantiation of derived classes
-// that are to be serialized through pointers.
-
 #include <boost/config.hpp>
 
 // the following help macro is to guarentee that certain coded

Modified: branches/release/boost/serialization/hash_map.hpp
==============================================================================
--- branches/release/boost/serialization/hash_map.hpp	(original)
+++ branches/release/boost/serialization/hash_map.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -70,7 +70,7 @@
         BOOST_STD_EXTENSION_NAMESPACE::hash_map<
             Key, HashFcn, EqualKey, Allocator
         >,
-        boost::serialization::stl::archive_input_unique<
+        boost::serialization::stl::archive_input_map<
             Archive, 
             BOOST_STD_EXTENSION_NAMESPACE::hash_map<
                 Key, HashFcn, EqualKey, Allocator
@@ -140,7 +140,7 @@
         BOOST_STD_EXTENSION_NAMESPACE::hash_multimap<
             Key, HashFcn, EqualKey, Allocator
         >,
-        boost::serialization::stl::archive_input_multi<
+        boost::serialization::stl::archive_input_multimap<
             Archive, 
             BOOST_STD_EXTENSION_NAMESPACE::hash_multimap<
                 Key, HashFcn, EqualKey, Allocator

Modified: branches/release/boost/serialization/hash_set.hpp
==============================================================================
--- branches/release/boost/serialization/hash_set.hpp	(original)
+++ branches/release/boost/serialization/hash_set.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -68,7 +68,7 @@
         BOOST_STD_EXTENSION_NAMESPACE::hash_set<
             Key, HashFcn, EqualKey, Allocator
         >,
-        boost::serialization::stl::archive_input_unique<
+        boost::serialization::stl::archive_input_set<
             Archive, 
             BOOST_STD_EXTENSION_NAMESPACE::hash_set<
                 Key, HashFcn, EqualKey, Allocator
@@ -138,7 +138,7 @@
         BOOST_STD_EXTENSION_NAMESPACE::hash_multiset<
             Key, HashFcn, EqualKey, Allocator
         >,
-        boost::serialization::stl::archive_input_multi<
+        boost::serialization::stl::archive_input_multiset<
             Archive,
             BOOST_STD_EXTENSION_NAMESPACE::hash_multiset<
                 Key, HashFcn, EqualKey, Allocator

Deleted: branches/release/boost/serialization/is_abstract.hpp
==============================================================================
--- branches/release/boost/serialization/is_abstract.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
+++ (empty file)
@@ -1,45 +0,0 @@
-#ifndef BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP
-#define BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP
-
-// MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// is_abstract_class.hpp:
-
-// (C) Copyright 2002 Rani Sharoni (rani_sharoni_at_[hidden]) and Robert Ramey
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for updates, documentation, and revision history.
-
-#include <boost/config.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-
-namespace boost {
-namespace serialization {
-    template<class T>
-    struct is_abstract
-#ifdef BOOST_NO_IS_ABSTRACT
-      : mpl::false_
-#else
-      : boost::is_abstract<T>
-#endif 
-    {};
-} // namespace serialization
-} // namespace boost
-
-// define a macro to make explicit designation of this more transparent
-#define BOOST_IS_ABSTRACT(T)                          \
-namespace boost {                                     \
-namespace serialization {                             \
-template<>                                            \
-struct is_abstract< T > : mpl::true_ {};              \
-}}                                                    \
-/**/
-
-#endif //BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP

Modified: branches/release/boost/serialization/map.hpp
==============================================================================
--- branches/release/boost/serialization/map.hpp	(original)
+++ branches/release/boost/serialization/map.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -50,7 +50,7 @@
     boost::serialization::stl::load_collection<
         Archive,
         std::map<Key, Type, Compare, Allocator>,
-        boost::serialization::stl::archive_input_unique<
+        boost::serialization::stl::archive_input_map<
             Archive, std::map<Key, Type, Compare, Allocator> >,
             boost::serialization::stl::no_reserve_imp<std::map<
                 Key, Type, Compare, Allocator
@@ -92,7 +92,7 @@
     boost::serialization::stl::load_collection<
         Archive,
         std::multimap<Key, Type, Compare, Allocator>,
-        boost::serialization::stl::archive_input_multi<
+        boost::serialization::stl::archive_input_multimap<
             Archive, std::multimap<Key, Type, Compare, Allocator> 
         >,
         boost::serialization::stl::no_reserve_imp<

Modified: branches/release/boost/serialization/optional.hpp
==============================================================================
--- branches/release/boost/serialization/optional.hpp	(original)
+++ branches/release/boost/serialization/optional.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -20,6 +20,7 @@
 #include <boost/serialization/split_free.hpp>
 #include <boost/serialization/level.hpp>
 #include <boost/serialization/nvp.hpp>
+#include <boost/serialization/version.hpp>
 #include <boost/serialization/detail/stack_constructor.hpp>
 
 // function specializations must be defined in the appropriate
@@ -53,7 +54,7 @@
     bool tflag;
     ar >> boost::serialization::make_nvp("initialized", tflag);
     if (tflag){
-        unsigned int v;
+        unsigned int v = 0;
         if(3 < ar.get_library_version()){
             ar >> make_nvp("item_version", v);
         }

Modified: branches/release/boost/serialization/serialization.hpp
==============================================================================
--- branches/release/boost/serialization/serialization.hpp	(original)
+++ branches/release/boost/serialization/serialization.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -10,14 +10,7 @@
 #  pragma warning (disable : 4675) // suppress ADL warning
 #endif
 
-#include <cstddef> // size_t
 #include <boost/config.hpp>
-#if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
-    using ::size_t; 
-} // namespace std
-#endif
-
 #include <boost/strong_typedef.hpp>
 #include <boost/pfto.hpp>
 #include <boost/throw_exception.hpp>

Modified: branches/release/boost/serialization/set.hpp
==============================================================================
--- branches/release/boost/serialization/set.hpp	(original)
+++ branches/release/boost/serialization/set.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -47,7 +47,7 @@
     boost::serialization::stl::load_collection<
         Archive,
         std::set<Key, Compare, Allocator>,
-        boost::serialization::stl::archive_input_unique<
+        boost::serialization::stl::archive_input_set<
             Archive, std::set<Key, Compare, Allocator> 
         >,
         boost::serialization::stl::no_reserve_imp<std::set<
@@ -89,7 +89,7 @@
     boost::serialization::stl::load_collection<
         Archive,
         std::multiset<Key, Compare, Allocator>,
-        boost::serialization::stl::archive_input_multi<
+        boost::serialization::stl::archive_input_multiset<
             Archive, std::multiset<Key, Compare, Allocator> 
         >,
         boost::serialization::stl::no_reserve_imp<

Modified: branches/release/boost/serialization/shared_ptr.hpp
==============================================================================
--- branches/release/boost/serialization/shared_ptr.hpp	(original)
+++ branches/release/boost/serialization/shared_ptr.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,6 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <map>
+#include <cstddef> // NULL
 
 #include <boost/config.hpp>
 #include <boost/mpl/integral_c.hpp>

Modified: branches/release/boost/serialization/shared_ptr_132.hpp
==============================================================================
--- branches/release/boost/serialization/shared_ptr_132.hpp	(original)
+++ branches/release/boost/serialization/shared_ptr_132.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -23,17 +23,16 @@
 #include <boost/config.hpp>
 
 #include <list>
+#include <cstddef> // NULL
 
-#include <boost/serialization/detail/shared_ptr_132.hpp>
-
-#include <boost/serialization/is_abstract.hpp>
+#include <boost/serialization/assume_abstract.hpp>
 #include <boost/serialization/split_free.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/tracking.hpp>
 #include <boost/serialization/void_cast.hpp>
 
 // mark base class as an (uncreatable) base class
-BOOST_IS_ABSTRACT(boost_132::detail::sp_counted_base)
+#include <boost/serialization/detail/shared_ptr_132.hpp>
 
 /////////////////////////////////////////////////////////////
 // Maintain a couple of lists of loaded shared pointers of the old previous
@@ -77,8 +76,9 @@
 template<class Archive, class P, class D>
 inline void save_construct_data(
     Archive & ar,
-    const boost_132::detail::sp_counted_base_impl<P, D> *t, 
-    const unsigned int /* file_version */
+    const 
+    boost_132::detail::sp_counted_base_impl<P, D> *t, 
+    const BOOST_PFTO unsigned int /* file_version */
 ){
     // variables used for construction
     ar << boost::serialization::make_nvp("ptr", t->ptr);

Added: branches/release/boost/serialization/singleton.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/serialization/singleton.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,126 @@
+#ifndef BOOST_SERIALIZATION_SINGLETON_HPP
+#define BOOST_SERIALIZATION_SINGLETON_HPP
+
+/////////1/////////2///////// 3/////////4/////////5/////////6/////////7/////////8
+//  singleton.hpp
+//
+// Copyright David Abrahams 2006. Original version
+//
+// Copyright Robert Ramey 2007.  Changes made to permit
+// application throughout the serialization library.
+//
+// Distributed under the Boost
+// Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// The intention here is to define a template which will convert
+// any class into a singleton with the following features:
+//
+// a) initialized before first use.
+// b) thread-safe for const access to the class
+// c) non-locking
+//
+// In order to do this,
+// a) Initialize dynamically when used.
+// b) Require that all singletons be initialized before main
+// is called or any entry point into the shared library is invoked.
+// This guarentees no race condition for initialization.
+// In debug mode, we assert that no non-const functions are called
+// after main is invoked.
+//
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif 
+
+#include <cassert>
+#include <boost/noncopyable.hpp>
+#include <boost/serialization/force_include.hpp>
+
+namespace boost { 
+namespace serialization { 
+
+//////////////////////////////////////////////////////////////////////
+// Provides a dynamically-initialized (singleton) instance of T in a
+// way that avoids LNK1179 on vc6.  See http://tinyurl.com/ljdp8 or
+// http://lists.boost.org/Archives/boost/2006/05/105286.php for
+// details.
+//
+
+// singletons created by this code are guarenteed to be unique
+// within the executable or shared library which creates them.
+// This is sufficient and in fact ideal for the serialization library.
+// The singleton is created when the module is loaded and destroyed
+// when the module is unloaded.
+
+// This base class has two functions.
+
+// First it provides a module handle for each singleton indicating
+// the executable or shared library in which it was created. This
+// turns out to be necessary and sufficient to implement the tables
+// used by serialization library.
+
+// Second, it provides a mechanism to detect when a non-const function
+// is called after initialization.
+
+// make a singleton to lock/unlock all singletons for alteration.
+// The intent is that all singletons created/used by this code
+// are to be initialized before main is called. A test program
+// can lock all the singletons when main is entereed.  This any
+// attempt to retieve a mutable instances while locked will
+// generate a assertion if compiled for debug.
+
+class singleton_module  : public boost::noncopyable
+{
+private:
+    static bool & get_lock(){
+        static bool lock = false;
+        return lock;
+    }
+public:
+//    static const void * get_module_handle(){
+//        return static_cast<const void *>(get_module_handle);
+//    }
+    static void lock(){
+        get_lock() = true;
+    }
+    static void unlock(){
+        get_lock() = false;
+    }
+    static bool is_locked() {
+        return get_lock();
+    }
+};
+
+template <class T>
+class singleton : public singleton_module
+{
+private:
+    BOOST_DLLEXPORT static T & instance;
+    // include this to provoke instantiation at pre-execution time
+    static void use(T const &) {}
+    BOOST_DLLEXPORT static T & get_instance() {
+        static T t;
+        // refer to instance, causing it to be instantiated (and
+        // initialized at startup on working compilers)
+        use(instance);
+        return t;
+    }
+public:
+    BOOST_DLLEXPORT static T & get_mutable_instance(){
+        assert(! is_locked());
+        return get_instance();
+    }
+    BOOST_DLLEXPORT static const T & get_const_instance(){
+        return get_instance();
+    }
+};
+
+template<class T>
+BOOST_DLLEXPORT T & singleton<T>::instance = singleton<T>::get_instance();
+
+} // namespace serialization
+} // namespace boost
+
+#endif // BOOST_SERIALIZATION_SINGLETON_HPP

Modified: branches/release/boost/serialization/slist.hpp
==============================================================================
--- branches/release/boost/serialization/slist.hpp	(original)
+++ branches/release/boost/serialization/slist.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -16,7 +16,14 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <boost/config.hpp>
+#include <cstddef> // size_t
+#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{ 
+    using ::size_t; 
+} // namespace std
+#endif
+
 #ifdef BOOST_HAS_SLIST
 #include BOOST_SLIST_HEADER
 

Modified: branches/release/boost/serialization/type_info_implementation.hpp
==============================================================================
--- branches/release/boost/serialization/type_info_implementation.hpp	(original)
+++ branches/release/boost/serialization/type_info_implementation.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -61,7 +61,7 @@
 namespace serialization {                          \
 template<>                                         \
 struct type_info_implementation< T > {             \
-    typedef ETI type;                              \
+    typedef const ETI type;                        \
 };                                                 \
 }                                                  \
 }                                                  \

Modified: branches/release/boost/serialization/utility.hpp
==============================================================================
--- branches/release/boost/serialization/utility.hpp	(original)
+++ branches/release/boost/serialization/utility.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -23,6 +23,7 @@
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/is_bitwise_serializable.hpp>
+#include <boost/mpl/and.hpp>
 
 namespace boost { 
 namespace serialization {

Modified: branches/release/boost/serialization/valarray.hpp
==============================================================================
--- branches/release/boost/serialization/valarray.hpp	(original)
+++ branches/release/boost/serialization/valarray.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -7,7 +7,7 @@
 #endif
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// vector.hpp: serialization for stl vector templates
+// valarray.hpp: serialization for stl vector templates
 
 // (C) Copyright 2005 Matthias Troyer . 
 // Use, modification and distribution is subject to the Boost Software
@@ -37,7 +37,7 @@
 // valarray<T>
 
 template<class Archive, class U>
-void save( Archive & ar, const STD::valarray<U> &t, const unsigned int file_version )
+void save( Archive & ar, const STD::valarray<U> &t, const unsigned int /*file_version*/ )
 {
   const collection_size_type count(t.size());
   ar << BOOST_SERIALIZATION_NVP(count);
@@ -47,7 +47,7 @@
 
 
 template<class Archive, class U>
-void load( Archive & ar, STD::valarray<U> &t,  const unsigned int file_version )
+void load( Archive & ar, STD::valarray<U> &t,  const unsigned int /*file_version*/ )
 {
   collection_size_type count;
   ar >> BOOST_SERIALIZATION_NVP(count);

Modified: branches/release/boost/serialization/variant.hpp
==============================================================================
--- branches/release/boost/serialization/variant.hpp	(original)
+++ branches/release/boost/serialization/variant.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -63,7 +63,7 @@
 void save(
     Archive & ar,
     boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const & v,
-    unsigned int version
+    unsigned int /*version*/
 ){
     int which = v.which();
     ar << BOOST_SERIALIZATION_NVP(which);
@@ -78,10 +78,10 @@
     struct load_null {
         template<class Archive, class V>
         static void invoke(
-            Archive & ar,
-            int which,
-            V & v,
-            unsigned int version
+            Archive & /*ar*/,
+            int /*which*/,
+            V & /*v*/,
+            unsigned int /*version*/
         ){}
     };
 

Modified: branches/release/boost/serialization/vector.hpp
==============================================================================
--- branches/release/boost/serialization/vector.hpp	(original)
+++ branches/release/boost/serialization/vector.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -27,7 +27,6 @@
 #include <boost/serialization/split_free.hpp>
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/detail/get_data.hpp>
-#include <boost/detail/has_default_constructor.hpp>
 #include <boost/mpl/bool.hpp>
 
 namespace boost { 
@@ -78,7 +77,11 @@
 ){
     const collection_size_type count(t.size());
     ar << BOOST_SERIALIZATION_NVP(count);
-    if (!t.empty())
+    if(3 < ar.get_library_version()) {
+      const unsigned int item_version = version<U>::value;
+      ar << BOOST_SERIALIZATION_NVP(item_version);
+    }
+   if (!t.empty())
       ar << make_array(detail::get_data(t),t.size());
 }
 
@@ -92,6 +95,9 @@
     collection_size_type count(t.size());
     ar >> BOOST_SERIALIZATION_NVP(count);
     t.resize(count);
+    unsigned int item_version=0;
+    if(3 < ar.get_library_version())
+        ar >> BOOST_SERIALIZATION_NVP(item_version);
     if (!t.empty())
       ar >> make_array(detail::get_data(t),t.size());
   }
@@ -104,7 +110,7 @@
     const std::vector<U, Allocator> &t,
     const unsigned int file_version
 ){
-    save(ar,t,file_version, boost::detail::has_default_constructor<U>());
+    save(ar,t,file_version, typename use_array_optimization<Archive>::template apply<U>::type());
 }
 
 template<class Archive, class U, class Allocator>
@@ -113,7 +119,7 @@
     std::vector<U, Allocator> &t,
     const unsigned int file_version
 ){
-    load(ar,t,file_version, boost::detail::has_default_constructor<U>());
+    load(ar,t,file_version, typename use_array_optimization<Archive>::template apply<U>::type());
 }
 
 // split non-intrusive serialization function member into separate

Modified: branches/release/boost/serialization/void_cast.hpp
==============================================================================
--- branches/release/boost/serialization/void_cast.hpp	(original)
+++ branches/release/boost/serialization/void_cast.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,13 +18,11 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <boost/smart_cast.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
-
-#include <boost/serialization/config.hpp>
+#include <boost/serialization/singleton.hpp>
 #include <boost/serialization/force_include.hpp>
 #include <boost/serialization/type_info_implementation.hpp>
-
+#include <boost/serialization/config.hpp>
+#include <boost/serialization/force_include.hpp>
 #include <boost/config/abi_prefix.hpp> // must be the last header
 
 #ifdef BOOST_MSVC
@@ -35,7 +33,7 @@
 namespace boost { 
 namespace serialization { 
 
-class BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) extended_type_info;
+BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) class extended_type_info;
 
 // Given a void *, assume that it really points to an instance of one type
 // and alter it so that it would point to an instance of a related type.
@@ -44,156 +42,121 @@
 
 BOOST_SERIALIZATION_DECL(void const *)
 void_upcast(
-    extended_type_info const & derived_type,  
-    extended_type_info const & base_type, 
-    void const * const t,
-    bool top = true
+    extended_type_info const & derived,  
+    extended_type_info const & base, 
+    void const * const t
 );
 
 inline void *
 void_upcast(
-    extended_type_info const & derived_type_,
-    extended_type_info const & base_type_,
+    extended_type_info const & derived,
+    extended_type_info const & base,
     void * const t 
 ){
     return const_cast<void*>(void_upcast(
-        derived_type_, 
-        base_type_, 
+        derived, 
+        base, 
         const_cast<void const *>(t)
     ));
 }
 
 BOOST_SERIALIZATION_DECL(void const *)
 void_downcast(
-    extended_type_info const & derived_type,  
-    extended_type_info const & base_type, 
-    void const * const t,
-    bool top = true
+    extended_type_info const & derived,  
+    extended_type_info const & base, 
+    void const * const t
 );
 
 inline void *
 void_downcast(
-    extended_type_info const & derived_type_,
-    extended_type_info const & base_type_,
+    extended_type_info const & derived,
+    extended_type_info const & base,
     void * const t 
 ){
     return const_cast<void*>(void_downcast(
-        derived_type_, 
-        base_type_, 
+        derived, 
+        base, 
         const_cast<void const *>(t)
     ));
 }
 
 namespace void_cast_detail {
 
-// note: can't be abstract because an instance is used as a search argument
 class BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) void_caster
 {
     friend struct void_caster_compare ;
     friend 
-    BOOST_SERIALIZATION_DECL(void const *)  
+    BOOST_SERIALIZATION_DECL(void const *)
     boost::serialization::void_upcast(
-        const extended_type_info & derived_type,
-        const extended_type_info & base_type,
-        const void * t,
-        bool top
+        extended_type_info const & derived,
+        extended_type_info const & base,
+        void const * const
     );
     friend 
     BOOST_SERIALIZATION_DECL(void const *)  
     boost::serialization::void_downcast(
-        const extended_type_info & derived_type,
-        const extended_type_info & base_type,
-        const void * t,
-        bool top
+        extended_type_info const & derived,
+        extended_type_info const & base,
+        void const * const
     );
-    // each derived class must re-implement these;
-    virtual void const * upcast(void const * t) const = 0;
-    virtual void const * downcast(void const * t) const = 0;
     // Data members
-    extended_type_info const & m_derived_type;
-    extended_type_info const & m_base_type;
+    const extended_type_info & m_derived;
+    const extended_type_info & m_base;
+    // each derived class must re-implement these;
+    virtual void const * upcast(void const * const t) const = 0;
+    virtual void const * downcast(void const * const t) const = 0;
+    // cw 8.3 requires this!!
+    void_caster& operator=(void_caster const &);
 protected:
-    static void static_register(const void_caster *);
+    void
+    static_register() const;
+    void
+    static_unregister() const;
 public:
     // Constructor
     void_caster(
-        extended_type_info const & derived_type_,
-        extended_type_info const & base_type_ 
+        extended_type_info const & derived,
+        extended_type_info const & base
     );
-    // predicate used to determine if this void caster includes
-    // a particular eti *
-    bool includes(const extended_type_info * eti) const;
-    virtual ~void_caster();
-private:
-    // cw 8.3 requires this!!
-    void_caster& operator=(void_caster const&);
+    virtual ~void_caster(){};
+    bool operator==(const void_caster & rhs) const;
 };
 
 template <class Derived, class Base>
 class void_caster_primitive : 
     public void_caster
 {
-    virtual void const* downcast( void const * t ) const {
-        Derived * d = boost::smart_cast<const Derived *, const Base *>(
+    virtual void const * downcast(void const * const t) const {
+        const Derived * d = boost::smart_cast<const Derived *, const Base *>(
             static_cast<const Base *>(t)
         );
         return d;
     }
-    virtual void const* upcast(void const * t) const {
-        Base * b = boost::smart_cast<const Base *, const Derived *>(
+    virtual void const * upcast(void const * const t) const {
+        const Base * b = boost::smart_cast<const Base *, const Derived *>(
             static_cast<const Derived *>(t)
         );
         return b;
     }
-
+public:
     BOOST_DLLEXPORT void_caster_primitive() BOOST_USED;
-    
-    static BOOST_DLLEXPORT void_caster_primitive const& instance;
-
-    // Something we can use to force instantiation without generating
-    // warnings.
-    static void use(void_caster_primitive const&) {}
-    
- public:
-    // CodeWarrior fails to construct static members of class
-    // templates when they are instantiated from within templates, so
-    // we do everything with void_caster_primitive in terms of
-    // get_instance.  On CodeWarrior, the user must invoke
-    // BOOST_SERIALIZATION_MWERKS_BASE_AND_DERIVED to make this work
-    // (see boost/serialization/export.hpp).  On other compilers (and
-    // if the bug is fixed in a future version of CodeWarriror), the
-    // initialization of instance (above) obviates the need for
-    // BOOST_SERIALIZATION_MWERKS_BASE_AND_DERIVED.
-    static BOOST_DLLEXPORT void_caster_primitive const& get_instance()
-    {
-        static void_caster_primitive instance_;
-        
-        // refer to instance, causing it to be instantiated (and
-        // initialized at startup on working compilers)
-        use(instance);
-
-        return instance_;
-    }
+    ~void_caster_primitive();
 };
 
 template <class Derived, class Base>
 BOOST_DLLEXPORT void_caster_primitive<Derived, Base>::void_caster_primitive() :
     void_caster( 
-        * type_info_implementation<Derived>::type::get_instance(), 
-        * type_info_implementation<Base>::type::get_instance() 
+        type_info_implementation<Derived>::type::get_const_instance(), 
+        type_info_implementation<Base>::type::get_const_instance()
     )
 {
-    // calling get_instance() causes infinite recursion, and the
-    // instance reference isn't initialized yet, so we must pass this
-    // to static_register.  It *is* the same object as instance, but
-    // there's no way even to assert that here.
-    this->static_register(this);
+    static_register();
 }
 
 template <class Derived, class Base>
-BOOST_DLLEXPORT void_caster_primitive<Derived,Base> const&
-void_caster_primitive<Derived,Base>::instance
-= void_caster_primitive<Derived,Base>::get_instance();
+void_caster_primitive<Derived, Base>::~void_caster_primitive(){
+    static_unregister();
+}
 
 } // void_cast_detail 
 
@@ -207,20 +170,25 @@
     const Derived * dnull, 
     const Base * bnull
 ) BOOST_USED;
+
 template<class Derived, class Base>
 BOOST_DLLEXPORT 
 inline const void_cast_detail::void_caster & void_cast_register(
-    const Derived * /* dnull = NULL */, 
-    const Base * /* bnull = NULL */
+    Derived const * /* dnull = NULL */, 
+    Base const * /* bnull = NULL */
 ){
-    return void_cast_detail::void_caster_primitive<
-        const Derived, const Base
-    >::get_instance();
+    return singleton<void_cast_detail::void_caster_primitive<
+        Derived, Base
+    > >::get_const_instance();
 }
 
 } // namespace serialization
 } // namespace boost
 
+#ifdef BOOST_MSVC  
+#  pragma warning(pop)  
+#endif
+
 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_SERIALIZATION_VOID_CAST_HPP

Modified: branches/release/boost/serialization/void_cast_fwd.hpp
==============================================================================
--- branches/release/boost/serialization/void_cast_fwd.hpp	(original)
+++ branches/release/boost/serialization/void_cast_fwd.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,6 +17,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
+#include <boost/serialization/force_include.hpp>
+
 namespace boost {
 namespace serialization {
 namespace void_cast_detail{

Modified: branches/release/boost/serialization/weak_ptr.hpp
==============================================================================
--- branches/release/boost/serialization/weak_ptr.hpp	(original)
+++ branches/release/boost/serialization/weak_ptr.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -29,7 +29,7 @@
     const unsigned int /* file_version */
 ){
     const boost::shared_ptr<T> sp = t.lock();
-        ar << boost::serialization::make_nvp(NULL, sp);
+        ar << boost::serialization::make_nvp("shared_ptr", sp);
 }
 
 template<class Archive, class T>
@@ -39,7 +39,7 @@
     const unsigned int /* file_version */
 ){
     boost::shared_ptr<T> sp;
-        ar >> boost::serialization::make_nvp(NULL, sp);
+        ar >> boost::serialization::make_nvp("shared_ptr", sp);
     t = sp;
 }
 

Modified: branches/release/libs/mpi/build/Jamfile.v2
==============================================================================
--- branches/release/libs/mpi/build/Jamfile.v2	(original)
+++ branches/release/libs/mpi/build/Jamfile.v2	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -82,6 +82,7 @@
         python/datatypes.cpp
         python/documentation.cpp
         python/py_environment.cpp
+        python/py_nonblocking.cpp
         python/py_exception.cpp
         python/module.cpp
         python/py_request.cpp

Modified: branches/release/libs/mpi/build/__init__.py
==============================================================================
--- branches/release/libs/mpi/build/__init__.py	(original)
+++ branches/release/libs/mpi/build/__init__.py	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,10 +1,10 @@
 import sys
 if sys.platform == 'linux2':
-    import dl
+    import DLFCN as dl
     flags = sys.getdlopenflags()
     sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL)
     import mpi
     sys.setdlopenflags(flags)
 else:
-import mpi
+    import mpi
 

Modified: branches/release/libs/mpi/doc/mpi.qbk
==============================================================================
--- branches/release/libs/mpi/doc/mpi.qbk	(original)
+++ branches/release/libs/mpi/doc/mpi.qbk	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -2025,6 +2025,9 @@
 
 [section:history Revision History]
 
+* *Boost 1.36.0*: 
+  * Support for non-blocking operations in Python, from Andreas Klöckner
+
 * *Boost 1.35.0*: Initial release, containing the following post-review changes 
   * Support for arrays in all collective operations
   * Support default-construction of [classref boost::mpi::environment environment]

Modified: branches/release/libs/mpi/src/content_oarchive.cpp
==============================================================================
--- branches/release/libs/mpi/src/content_oarchive.cpp	(original)
+++ branches/release/libs/mpi/src/content_oarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -14,5 +14,6 @@
 // explicitly instantiate all required template functions
 
 template class archive_pointer_oserializer<mpi::detail::content_oarchive> ;
-
+template class archive_pointer_oserializer<boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::content_oarchive> >;
+template class archive_pointer_oserializer<boost::mpi::detail::ignore_skeleton_oarchive<boost::mpi::detail::mpi_datatype_oarchive> >;
 } } }

Modified: branches/release/libs/mpi/src/mpi_datatype_cache.cpp
==============================================================================
--- branches/release/libs/mpi/src/mpi_datatype_cache.cpp	(original)
+++ branches/release/libs/mpi/src/mpi_datatype_cache.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,16 +13,16 @@
 namespace boost { namespace mpi { namespace detail {
 
   typedef std::map<std::type_info const*,MPI_Datatype,type_info_compare>
-	  stored_map_type;
+      stored_map_type;
 
   struct mpi_datatype_map::implementation
   {
-	stored_map_type map;
+    stored_map_type map;
   };
 
   mpi_datatype_map::mpi_datatype_map()
   {
-	  impl = new implementation();
+      impl = new implementation();
   }
 
   mpi_datatype_map::~mpi_datatype_map()
@@ -30,32 +30,31 @@
     // do not free after call to MPI_FInalize
     int finalized=0;
     BOOST_MPI_CHECK_RESULT(MPI_Finalized,(&finalized));
-	if (!finalized) {
-	  // ignore errors in the destructor
-	  for (stored_map_type::iterator it=impl->map.begin(); it != impl->map.end(); ++it) {
- 	    MPI_Type_free(&(it->second));
-	  }
-	}
-	delete impl;
+    if (!finalized) {
+      // ignore errors in the destructor
+      for (stored_map_type::iterator it=impl->map.begin(); it != impl->map.end(); ++it)
+        MPI_Type_free(&(it->second));
+    }
+    delete impl;
   }
 
   MPI_Datatype mpi_datatype_map::get(const std::type_info* t)
   {
-	  stored_map_type::iterator pos = impl->map.find(t);
-	  if (pos != impl->map.end())
-		  return pos->second;
-	  else
-		  return MPI_DATATYPE_NULL;
+      stored_map_type::iterator pos = impl->map.find(t);
+      if (pos != impl->map.end())
+          return pos->second;
+      else
+          return MPI_DATATYPE_NULL;
   }
 
   void mpi_datatype_map::set(const std::type_info* t, MPI_Datatype datatype)
   {
-	  impl->map[t] = datatype;
+      impl->map[t] = datatype;
   }
 
   mpi_datatype_map& mpi_datatype_cache()
   {
-	static mpi_datatype_map cache;
-	return cache;
+    static mpi_datatype_map cache;
+    return cache;
   }
 } } }

Modified: branches/release/libs/mpi/src/packed_skeleton_iarchive.cpp
==============================================================================
--- branches/release/libs/mpi/src/packed_skeleton_iarchive.cpp	(original)
+++ branches/release/libs/mpi/src/packed_skeleton_iarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,7 +8,6 @@
 
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/impl/archive_pointer_iserializer.ipp>
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
 #include <boost/mpi/skeleton_and_content.hpp>
 
 #include <boost/archive/binary_iarchive.hpp>
@@ -21,6 +20,9 @@
 
 template class basic_binary_iarchive<mpi::packed_skeleton_iarchive> ;
 template class detail::archive_pointer_iserializer<mpi::packed_skeleton_iarchive> ;
+template class detail::archive_pointer_iserializer<
+  mpi::detail::forward_skeleton_iarchive<
+    boost::mpi::packed_skeleton_iarchive, boost::mpi::packed_iarchive> > ;
 //template class binary_iarchive_impl<packed_skeleton_iarchive> ;
 
 } } // end namespace boost::archive

Modified: branches/release/libs/mpi/src/packed_skeleton_oarchive.cpp
==============================================================================
--- branches/release/libs/mpi/src/packed_skeleton_oarchive.cpp	(original)
+++ branches/release/libs/mpi/src/packed_skeleton_oarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -18,6 +18,9 @@
 // explicitly instantiate all required templates
 
 template class detail::archive_pointer_oserializer<mpi::packed_skeleton_oarchive> ;
+template class detail::archive_pointer_oserializer<
+  mpi::detail::forward_skeleton_oarchive<
+    boost::mpi::packed_skeleton_oarchive, boost::mpi::packed_oarchive> > ;
 template class basic_binary_oarchive<mpi::packed_skeleton_oarchive> ;
 //template class binary_oarchive_impl<mpi_packed_oarchive> ;
 

Modified: branches/release/libs/mpi/src/point_to_point.cpp
==============================================================================
--- branches/release/libs/mpi/src/point_to_point.cpp	(original)
+++ branches/release/libs/mpi/src/point_to_point.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -32,7 +32,7 @@
   BOOST_MPI_CHECK_RESULT(MPI_Send,
                          (const_cast<void*>(size), 1, 
                           get_mpi_datatype<std::size_t>(ar.size()), 
-						  dest, tag, comm));
+                          dest, tag, comm));
   BOOST_MPI_CHECK_RESULT(MPI_Send,
                          (const_cast<void*>(ar.address()), ar.size(),
                           MPI_PACKED,

Modified: branches/release/libs/mpi/src/python/documentation.cpp
==============================================================================
--- branches/release/libs/mpi/src/python/documentation.cpp	(original)
+++ branches/release/libs/mpi/src/python/documentation.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -132,10 +132,10 @@
   "\n"
   "  Once you have registered your C++ data structures, you can extract\n"
   "  the skeleton for an instance of that data structure with skeleton().\n"
-  "  The resulting skeleton_proxy can be transmitted via the normal send\n"
+  "  The resulting SkeletonProxy can be transmitted via the normal send\n"
   "  routine, e.g.,\n\n"
   "    mpi.world.send(1, 0, skeleton(my_data_structure))\n\n"
-  "  skeleton_proxy objects can be received on the other end via recv(),\n"
+  "  SkeletonProxy objects can be received on the other end via recv(),\n"
   "  which stores a newly-created instance of your data structure with the\n"
   "  same `shape' as the sender in its `object' attribute:\n\n"
   "    shape = mpi.world.recv(0, 0)\n"
@@ -212,6 +212,86 @@
   "Determine if the MPI environment has already been finalized.\n";
 
 /***********************************************************
+ * nonblocking documentation                               *
+ ***********************************************************/
+const char* request_list_init_docstring=
+  "Without arguments, constructs an empty RequestList.\n"
+  "With one argument `iterable', copies request objects from this\n"
+  "iterable to the new RequestList.\n";
+
+const char* nonblocking_wait_any_docstring =
+  "Waits until any of the given requests has been completed. It provides\n"
+  "functionality equivalent to MPI_Waitany.\n"
+  "\n"
+  "requests must be a RequestList instance.\n"
+  "\n"
+  "Returns a triple (value, status, index) consisting of received value\n"
+  "(or None), the Status object for the completed request, and its index\n"
+  "in the RequestList.\n";
+
+const char* nonblocking_test_any_docstring =
+  "Tests if any of the given requests have been completed, but does not wait\n"
+  "for completion. It provides functionality equivalent to MPI_Testany.\n"
+  "\n"
+  "requests must be a RequestList instance.\n"
+  "\n"
+  "Returns a triple (value, status, index) like wait_any or None if no request\n"
+  "is complete.\n";
+
+const char* nonblocking_wait_all_docstring =
+  "Waits until all of the given requests have been completed. It provides\n"
+  "functionality equivalent to MPI_Waitall.\n"
+  "\n"
+  "requests must be a RequestList instance.\n"
+  "\n"
+  "If the second parameter `callable' is provided, it is called with each\n"
+  "completed request's received value (or None) and it s Status object as\n"
+  "its arguments. The calls occur in the order given by the `requests' list.\n";
+
+const char* nonblocking_test_all_docstring =
+  "Tests if all of the given requests have been completed. It provides\n"
+  "functionality equivalent to MPI_Testall.\n"
+  "\n"
+  "Returns True if all requests have been completed.\n"
+  "\n"
+  "requests must be a RequestList instance.\n"
+  "\n"
+  "If the second parameter `callable' is provided, it is called with each\n"
+  "completed request's received value (or None) and it s Status object as\n"
+  "its arguments. The calls occur in the order given by the `requests' list.\n";
+
+const char* nonblocking_wait_some_docstring =
+  "Waits until at least one of the given requests has completed. It\n"
+  "then completes all of the requests it can, partitioning the input\n"
+  "sequence into pending requests followed by completed requests.\n"
+  "\n"
+  "This routine provides functionality equivalent to MPI_Waitsome.\n"
+  "\n"
+  "Returns the index of the first completed request."
+  "\n"
+  "requests must be a RequestList instance.\n"
+  "\n"
+  "If the second parameter `callable' is provided, it is called with each\n"
+  "completed request's received value (or None) and it s Status object as\n"
+  "its arguments. The calls occur in the order given by the `requests' list.\n";
+
+const char* nonblocking_test_some_docstring =
+  "Tests to see if any of the given requests has completed. It completes\n"
+  "all of the requests it can, partitioning the input sequence into pending\n"
+  "requests followed by completed requests. This routine is similar to\n"
+  "wait_some, but does not wait until any requests have completed.\n"
+  "\n"
+  "This routine provides functionality equivalent to MPI_Testsome.\n"
+  "\n"
+  "Returns the index of the first completed request."
+  "\n"
+  "requests must be a RequestList instance.\n"
+  "\n"
+  "If the second parameter `callable' is provided, it is called with each\n"
+  "completed request's received value (or None) and it s Status object as\n"
+  "its arguments. The calls occur in the order given by the `requests' list.\n";
+
+/***********************************************************
  * exception documentation                                 *
  ***********************************************************/
 const char* exception_docstring = 
@@ -310,14 +390,14 @@
  * communicator documentation                              *
  ***********************************************************/
 const char* communicator_docstring =
- "The communicator class abstracts a set of communicating\n"
+ "The Communicator class abstracts a set of communicating\n"
  "processes in MPI. All of the processes that belong to a certain\n"
  "communicator can determine the size of the communicator, their rank\n"
  "within the communicator, and communicate with any other processes\n"
  "in the communicator.\n";
 
 const char* communicator_default_constructor_docstring =
-  "Build a new Boost.MPI communicator for MPI_COMM_WORLD.\n";
+  "Build a new Boost.MPI Communicator instance for MPI_COMM_WORLD.\n";
 
 const char* communicator_rank_docstring =
   "Returns the rank of the process in the communicator, which will be a\n"
@@ -335,10 +415,10 @@
   "  - For C++ objects registered via register_serialized(), the value\n"
   "    will be serialized and transmitted.\n"
   "\n"
-  "  - For skeleton_proxy objects, the skeleton of the object will be\n"
+  "  - For SkeletonProxy objects, the skeleton of the object will be\n"
   "    serialized and transmitted.\n"
   "\n"
-  "  - For content objects, the content will be transmitted directly.\n"
+  "  - For Content objects, the content will be transmitted directly.\n"
   "    This content can be received by a matching recv/irecv call that\n"
   "    provides a suitable `buffer' argument.\n"
   "\n"
@@ -351,12 +431,12 @@
   "the message can be received from any process. Likewise, if the tag\n"
   "parameter is not specified, a message with any tag can be received.\n"
   "If return_status is True, returns a tuple containing the received\n"
-  "object followed by a status object describing the communication.\n"
+  "object followed by a Status object describing the communication.\n"
   "Otherwise, recv() returns just the received object.\n"
   "\n"
   "When receiving the content of a data type that has been sent separately\n"
   "from its skeleton, user code must provide a value for the `buffer'\n"
-  "argument. This value should be the content object returned from\n"
+  "argument. This value should be the Content object returned from\n"
   "get_content().\n";
 
 const char* communicator_isend_docstring =
@@ -364,7 +444,7 @@
   "tag to the process with rank dest. It can be received by the\n"
   "destination process with a matching recv call. The value will be\n"
   "transmitted in the same way as with send().\n"
-  "This routine returns a request object, which can be used to query\n"
+  "This routine returns a Request object, which can be used to query\n"
   "when the transmission has completed, wait for its completion, or\n"
   "cancel the transmission.\n";
 
@@ -373,15 +453,15 @@
   "source with the given tag. If the source parameter is not specified,\n"
   "the message can be received from any process. Likewise, if the tag\n"
   "parameter is not specified, a message with any tag can be received.\n"
-  "This routine returns a request object, which can be used to query\n"
+  "This routine returns a Request object, which can be used to query\n"
   "when the transmission has completed, wait for its completion, or\n"
   "cancel the transmission. The received value be accessible\n"
-  "through the `value' attribute of the request object once transmission\n"
+  "through the `value' attribute of the Request object once transmission\n"
   "has completed.\n"
   "\n"
   "As with the recv() routine, when receiving the content of a data type\n"
   "that has been sent separately from its skeleton, user code must provide\n"
-  "a value for the `buffer' argument. This value should be the content\n"
+  "a value for the `buffer' argument. This value should be the Content\n"
   "object returned from get_content().\n"; 
 
  const char* communicator_probe_docstring =
@@ -389,7 +469,7 @@
   "is available to be received. It then returns information about\n"
   "that message. If source is omitted, a message from any process\n"
   "will match. If tag is omitted, a message with any tag will match.\n"
-  "The actual source and tag can be retrieved from the returned status\n"
+  "The actual source and tag can be retrieved from the returned Status\n"
   "object. To check if a message is available without blocking, use\n"
   "iprobe.\n";
 
@@ -399,7 +479,7 @@
   "message; otherwise, it returns None. If source is omitted, a message\n"
   "from any process will match. If tag is omitted, a message with any\n"
   "tag will match. The actual source and tag can be retrieved from the\n"
-  "returned status object. To wait for a message to become available, use\n"
+  "returned Status object. To wait for a message to become available, use\n"
   "probe.\n";
 
 const char* communicator_barrier_docstring = 
@@ -418,8 +498,8 @@
   "the ordering of processes with the same color in the resulting\n"
   "communicator. If omitted, the key will default to the rank of\n"
   "the process in the current communicator.\n\n"
-  "Returns a new communicator containing all of the processes in\n"
-  "this communicator that have the same color.\n";
+  "Returns a new Communicator instance containing all of the \n"
+  "processes in this communicator that have the same color.\n";
 
 const char* communicator_abort_docstring = 
   "Makes a \"best attempt\" to abort all of the tasks in the group of\n"
@@ -435,36 +515,46 @@
  * request documentation                                   *
  ***********************************************************/
 const char* request_docstring = 
-  "The request class contains information about a non-blocking send\n"
+  "The Request class contains information about a non-blocking send\n"
   "or receive and will be returned from isend or irecv, respectively.\n"
-  "When a request object represents a completed irecv, the `value' \n"
+  "When a Request object represents a completed irecv, the `value' \n"
   "attribute will contain the received value.\n";
 
+const char* request_with_value_docstring = 
+  "This class is an implementation detail. Any call that accepts a\n"
+  "Request also accepts a RequestWithValue, and vice versa.\n";
+
 const char* request_wait_docstring =
   "Wait until the communication associated with this request has\n"
   "completed. For a request that is associated with an isend(), returns\n"
-  "a status object describing the communication. For an irecv()\n"
+  "a Status object describing the communication. For an irecv()\n"
   "operation, returns the received value by default. However, when\n"
-  "return_status=True, a (value, status) pair is returned by a.\n"
+  "return_status=True, a (value, status) pair is returned by a\n"
   "completed irecv request.\n";
 
 const char* request_test_docstring =
   "Determine whether the communication associated with this request\n"
-  "has completed successfully. If so, returns the status object\n"
+  "has completed successfully. If so, returns the Status object\n"
   "describing the communication (for an isend request) or a tuple\n"
-  "containing the received value and a status object (for an irecv\n"
-  "request). Note that once test() returns a status object, the\n"
+  "containing the received value and a Status object (for an irecv\n"
+  "request). Note that once test() returns a Status object, the\n"
   "request has completed and wait() should not be called.\n";
 
 const char* request_cancel_docstring =
   "Cancel a pending communication, assuming it has not already been\n"
   "completed.\n";
 
+const char* request_value_docstring =
+  "If this request originated in an irecv(), this property makes the"
+  "sent value accessible once the request completes.\n"
+  "\n"
+  "If no value is available, ValueError is raised.\n";
+
 /***********************************************************
  * skeleton/content documentation                          *
  ***********************************************************/
 const char* object_without_skeleton_docstring = 
-  "The object_without_skeleton class is an exception class used only\n"
+  "The ObjectWithoutSkeleton class is an exception class used only\n"
   "when the skeleton() or get_content() function is called with an\n"
   "object that is not supported by the skeleton/content mechanism.\n"
   "All C++ types for which skeletons and content can be transmitted\n"
@@ -475,13 +565,13 @@
   "The object on which skeleton() or get_content() was invoked.\n";
 
 const char* skeleton_proxy_docstring = 
-  "The skeleton_proxy class is used to represent the skeleton of an\n"
-  "object. The skeleton_proxy can be used as the value parameter of\n"
+  "The SkeletonProxy class is used to represent the skeleton of an\n"
+  "object. The SkeletonProxy can be used as the value parameter of\n"
   "send() or isend() operations, but instead of transmitting the\n"
   "entire object, only its skeleton (\"shape\") will be sent, without\n"
   "the actual data. Its content can then be transmitted, separately.\n"
   "\n"
-  "User code cannot generate skeleton_proxy instances directly. To\n"
+  "User code cannot generate SkeletonProxy instances directly. To\n"
   "refer to the skeleton of an object, use skeleton(object). Skeletons\n"
   "can also be received with the recv() and irecv() methods.\n"
   "\n"
@@ -503,7 +593,7 @@
   "skeleton/content mechanism.\n";
 
 const char* skeleton_docstring = 
-  "The skeleton function retrieves the skeleton_proxy for its object\n"
+  "The skeleton function retrieves the SkeletonProxy for its object\n"
   "parameter, allowing the transmission of the skeleton (or \"shape\")\n"
   "of the object separately from its data. The skeleton/content mechanism\n"
   "is useful when a large data structure remains structurally the same\n"
@@ -534,7 +624,7 @@
  * status documentation                                    *
  ***********************************************************/
 const char* status_docstring = 
-  "The status class stores information about a given message, including\n"
+  "The Status class stores information about a given message, including\n"
   "its source, tag, and whether the message transmission was cancelled\n"
   "or resulted in an error.\n";
 
@@ -554,7 +644,7 @@
  * timer documentation                                     *
  ***********************************************************/
 const char* timer_docstring =
-  "The timer class is a simple wrapper around the MPI timing facilities.\n";
+  "The Timer class is a simple wrapper around the MPI timing facilities.\n";
 
 const char* timer_default_constructor_docstring =
   "Initializes the timer. After this call, elapsed == 0.\n";

Modified: branches/release/libs/mpi/src/python/module.cpp
==============================================================================
--- branches/release/libs/mpi/src/python/module.cpp	(original)
+++ branches/release/libs/mpi/src/python/module.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -27,6 +27,7 @@
 extern void export_request();
 extern void export_status();
 extern void export_timer();
+extern void export_nonblocking();
 
 extern const char* module_docstring;
 
@@ -35,7 +36,7 @@
   // Setup module documentation
   scope().attr("__doc__") = module_docstring;
   scope().attr("__author__") = "Douglas Gregor <doug.gregor_at_[hidden]>";
-  scope().attr("__date__") = "$LastChangedDate: 2006-07-16 15:25:47 -0400 (Sun, 16 Jul 2006) $";
+  scope().attr("__date__") = "$LastChangedDate$";
   scope().attr("__version__") = "$Revision$";
   scope().attr("__copyright__") = "Copyright (C) 2006 Douglas Gregor";
   scope().attr("__license__") = "http://www.boost.org/LICENSE_1_0.txt";
@@ -48,6 +49,7 @@
   export_request();
   export_status();
   export_timer();
+  export_nonblocking();
 }
 
 } } } // end namespace boost::mpi::python

Modified: branches/release/libs/mpi/src/python/py_communicator.cpp
==============================================================================
--- branches/release/libs/mpi/src/python/py_communicator.cpp	(original)
+++ branches/release/libs/mpi/src/python/py_communicator.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -14,6 +14,7 @@
 #include <boost/python.hpp>
 #include <boost/mpi.hpp>
 #include <boost/mpi/python/serialize.hpp>
+#include "request_with_value.hpp"
 
 using namespace boost::python;
 using namespace boost::mpi;
@@ -49,14 +50,12 @@
     return result;
 }
 
-object 
+request_with_value 
 communicator_irecv(const communicator& comm, int source, int tag)
 {
-  using boost::python::make_tuple;
-
-  object result;
-  object req(comm.irecv(source, tag, result));
-  req.attr("value") = result;
+  boost::shared_ptr<object> result(new object());
+  request_with_value req(comm.irecv(source, tag, *result));
+  req.m_internal_value = result;
   return req;
 }
 
@@ -76,7 +75,7 @@
   using boost::python::arg;
   using boost::python::object;
   
-  class_<communicator> comm("communicator", communicator_docstring);
+  class_<communicator> comm("Communicator", communicator_docstring);
   comm
     .def(init<>())
     .add_property("rank", &communicator::rank, communicator_rank_docstring)

Modified: branches/release/libs/mpi/src/python/py_exception.cpp
==============================================================================
--- branches/release/libs/mpi/src/python/py_exception.cpp	(original)
+++ branches/release/libs/mpi/src/python/py_exception.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -30,9 +30,8 @@
 
 str exception_str(const exception& e)
 {
-  return str("MPI routine `"  + std::string(e.routine()) + 
-             "' returned error code " + 
-             lexical_cast<std::string>(e.result_code()));
+  return str(std::string(e.what()) + 
+             " (code " + lexical_cast<std::string>(e.result_code())+")");
 }
 
 void export_exception()
@@ -42,10 +41,10 @@
   
   object type = 
     class_<exception>
-      ("exception", exception_docstring, no_init)
+      ("Exception", exception_docstring, no_init)
       .add_property("what", &exception::what, exception_what_docstring)
       .add_property("routine", &exception::what, exception_routine_docstring)
-      .add_property("result_code", &exception::what, 
+      .add_property("result_code", &exception::result_code, 
                     exception_result_code_docstring)
       .def("__str__", &exception_str)
     ;

Added: branches/release/libs/mpi/src/python/py_nonblocking.cpp
==============================================================================
--- (empty file)
+++ branches/release/libs/mpi/src/python/py_nonblocking.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,255 @@
+// (C) Copyright 2007 
+// Douglas Gregor <doug.gregor -at- gmail.com>
+// Andreas Kloeckner <inform -at- tiker.net>
+
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  Authors: Douglas Gregor, Andreas Kloeckner
+
+/** @file py_nonblocking.cpp
+ *
+ *  This file reflects the Boost.MPI nonblocking operations into Python
+ *  functions.
+ */
+
+#include <vector>
+#include <iterator>
+#include <algorithm>
+#include <boost/operators.hpp>
+#include <boost/python.hpp>
+#include <boost/python/stl_iterator.hpp>
+#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#include <boost/mpi.hpp>
+#include "request_with_value.hpp"
+
+using namespace std;
+using namespace boost::python;
+using namespace boost::mpi;
+
+
+
+
+namespace
+{
+  template <class ValueType, class RequestIterator>
+  class py_call_output_iterator :
+    public boost::output_iterator_helper< 
+      py_call_output_iterator<ValueType, RequestIterator> >
+  {
+    private:
+      object m_callable;
+      RequestIterator m_request_iterator;
+
+    public:
+      explicit py_call_output_iterator(object callable, 
+          const RequestIterator &req_it)
+        : m_callable(callable), m_request_iterator(req_it)
+      { }
+
+      py_call_output_iterator &operator=(ValueType const &v)
+      {
+        m_callable((m_request_iterator++)->get_value_or_none(), v);
+        return *this;
+      }
+  };
+
+
+
+
+  typedef std::vector<python::request_with_value> request_list;
+  typedef py_call_output_iterator<status, request_list::iterator> 
+    status_value_iterator;
+
+
+
+
+  std::auto_ptr<request_list> make_request_list_from_py_list(object iterable)
+  {
+    std::auto_ptr<request_list> result(new request_list);
+    std::copy(
+        stl_input_iterator<python::request_with_value>(iterable),
+        stl_input_iterator<python::request_with_value>(),
+        back_inserter(*result));
+    return result;
+  }
+
+
+
+
+  class request_list_indexing_suite :
+    public vector_indexing_suite<request_list, false, request_list_indexing_suite>
+  {
+    public:
+      // FIXME: requests are not comparable, thus __contains__ makes no sense.
+      // Unfortunately, indexing_suites insist on having __contains__ available.
+      // Just make it error out for now.
+
+      static bool
+        contains(request_list& container, request const& key)
+        {
+          PyErr_SetString(PyExc_NotImplementedError, "mpi requests are not comparable");
+          throw error_already_set();
+        }
+  };
+
+
+
+
+  void check_request_list_not_empty(const request_list &requests)
+  {
+    if (requests.size() == 0)
+    {
+      PyErr_SetString(PyExc_ValueError, "cannot wait on an empty request vector");
+      throw error_already_set();
+    }
+
+  }
+
+
+
+
+
+  object wrap_wait_any(request_list &requests)
+  {
+    check_request_list_not_empty(requests);
+
+    pair<status, request_list::iterator> result = 
+      wait_any(requests.begin(), requests.end());
+
+    return make_tuple(
+        result.second->get_value_or_none(),
+        result.first, 
+        distance(requests.begin(), result.second));
+  }
+
+
+
+
+  object wrap_test_any(request_list &requests)
+  {
+    check_request_list_not_empty(requests);
+    ::boost::optional<pair<status, request_list::iterator> > result = 
+      test_any(requests.begin(), requests.end());
+
+    if (result)
+      return make_tuple(
+          result->second->get_value_or_none(),
+          result->first, 
+          distance(requests.begin(), result->second));
+    else
+      return object();
+  }
+
+
+
+
+
+  void wrap_wait_all(request_list &requests, object py_callable)
+  {
+    check_request_list_not_empty(requests);
+    if (py_callable != object())
+      wait_all(requests.begin(), requests.end(), 
+          status_value_iterator(py_callable, requests.begin()));
+    else
+      wait_all(requests.begin(), requests.end());
+  }
+
+
+
+
+  bool wrap_test_all(request_list &requests, object py_callable)
+  {
+    check_request_list_not_empty(requests);
+    if (py_callable != object())
+      return test_all(requests.begin(), requests.end(), 
+          status_value_iterator(py_callable, requests.begin()));
+    else
+      return test_all(requests.begin(), requests.end());
+  }
+
+
+
+
+  int wrap_wait_some(request_list &requests, object py_callable)
+  {
+    check_request_list_not_empty(requests);
+    request_list::iterator first_completed;
+    if (py_callable != object())
+      first_completed = wait_some(requests.begin(), requests.end(), 
+          status_value_iterator(py_callable, requests.begin())).second;
+    else
+      first_completed = wait_some(requests.begin(), requests.end());
+
+    return distance(requests.begin(), first_completed);
+  }
+
+
+
+
+  int wrap_test_some(request_list &requests, object py_callable)
+  {
+    check_request_list_not_empty(requests);
+    request_list::iterator first_completed;
+    if (py_callable != object())
+      first_completed = test_some(requests.begin(), requests.end(), 
+          status_value_iterator(py_callable, requests.begin())).second;
+    else
+      first_completed = test_some(requests.begin(), requests.end());
+
+    return distance(requests.begin(), first_completed);
+  }
+}
+
+
+
+
+namespace boost { namespace mpi { namespace python {
+
+extern const char* request_list_init_docstring;
+extern const char* request_list_append_docstring;
+
+extern const char* nonblocking_wait_any_docstring;
+extern const char* nonblocking_test_any_docstring;
+extern const char* nonblocking_wait_all_docstring;
+extern const char* nonblocking_test_all_docstring;
+extern const char* nonblocking_wait_some_docstring;
+extern const char* nonblocking_test_some_docstring;
+
+void export_nonblocking()
+{
+  using boost::python::arg;
+
+  {
+    typedef request_list cl;
+    class_<cl>("RequestList", "A list of Request objects.")
+      .def("__init__", make_constructor(make_request_list_from_py_list),
+          /*arg("iterable"),*/ request_list_init_docstring)
+      .def(request_list_indexing_suite())
+      ;
+  }
+
+  def("wait_any", wrap_wait_any,
+      (arg("requests")),
+      nonblocking_wait_any_docstring);
+  def("test_any", wrap_test_any,
+      (arg("requests")),
+      nonblocking_test_any_docstring);
+
+  def("wait_all", wrap_wait_all,
+      (arg("requests"), arg("callable") = object()),
+      nonblocking_wait_all_docstring);
+  def("test_all", wrap_test_all,
+      (arg("requests"), arg("callable") = object()),
+      nonblocking_test_all_docstring);
+
+  def("wait_some", wrap_wait_some,
+      (arg("requests"), arg("callable") = object()),
+      nonblocking_wait_some_docstring);
+  def("test_some", wrap_test_some,
+      (arg("requests"), arg("callable") = object()),
+      nonblocking_test_some_docstring);
+}
+
+} } }

Modified: branches/release/libs/mpi/src/python/py_request.cpp
==============================================================================
--- branches/release/libs/mpi/src/python/py_request.cpp	(original)
+++ branches/release/libs/mpi/src/python/py_request.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,52 +13,90 @@
  */
 #include <boost/python.hpp>
 #include <boost/mpi.hpp>
+#include "request_with_value.hpp"
 
 using namespace boost::python;
 using namespace boost::mpi;
 
-namespace boost { namespace mpi { namespace python {
-
-extern const char* request_docstring;
-extern const char* request_wait_docstring;
-extern const char* request_test_docstring;
-extern const char* request_cancel_docstring;
+const object python::request_with_value::get_value() const 
+{
+  if (m_internal_value.get())
+    return *m_internal_value;
+  else if (m_external_value)
+    return *m_external_value;
+  else
+  {
+    PyErr_SetString(PyExc_ValueError, "request value not available");
+    throw boost::python::error_already_set();
+  }
+}
 
-object request_wait(object req_obj)
+const object python::request_with_value::get_value_or_none() const 
 {
-  request& req = extract<request&>(req_obj)();
-  status stat = req.wait();
-  if (PyObject_HasAttrString(req_obj.ptr(), "value"))
-    return boost::python::make_tuple(stat, req_obj.attr("value"));
+  if (m_internal_value.get())
+    return *m_internal_value;
+  else if (m_external_value)
+    return *m_external_value;
   else
-    return object(stat);  
+    return object();
 }
 
-object request_test(object req_obj)
+const object python::request_with_value::wrap_wait()
 {
-  request& req = extract<request&>(req_obj)();
+  status stat = request::wait();
+  if (m_internal_value.get() || m_external_value)
+    return boost::python::make_tuple(get_value(), stat);
+  else
+    return object(stat);
+}
 
-  if (optional<status> stat = req.test())
-    {
-      if (PyObject_HasAttrString(req_obj.ptr(), "value"))
-        return boost::python::make_tuple(stat, req_obj.attr("value"));
-      else
-        return object(stat);
-    }
+const object python::request_with_value::wrap_test()
+{
+  ::boost::optional<status> stat = request::test();
+  if (stat)
+  {
+    if (m_internal_value.get() || m_external_value)
+      return boost::python::make_tuple(get_value(), *stat);
+    else
+      return object(*stat);
+  }
   else
     return object();
 }
 
+
+namespace boost { namespace mpi { namespace python {
+
+extern const char* request_docstring;
+extern const char* request_with_value_docstring;
+extern const char* request_wait_docstring;
+extern const char* request_test_docstring;
+extern const char* request_cancel_docstring;
+extern const char* request_value_docstring;
+
 void export_request()
 {
   using boost::python::arg;
   using boost::python::object;
   
-  class_<request>("request", request_docstring, no_init)
-    .def("wait", &request_wait, request_wait_docstring)
-    .def("test", &request_test, request_test_docstring)
-    .def("cancel", &request::cancel, request_cancel_docstring)
-    ;
+  {
+    typedef request cl;
+    class_<cl>("Request", request_docstring, no_init)
+      .def("wait", &cl::wait, request_wait_docstring)
+      .def("test", &cl::test, request_test_docstring)
+      .def("cancel", &cl::cancel, request_cancel_docstring)
+      ;
+  }
+  {
+    typedef request_with_value cl;
+    class_<cl, bases<request> >(
+        "RequestWithValue", request_with_value_docstring, no_init)
+      .def("wait", &cl::wrap_wait, request_wait_docstring)
+      .def("test", &cl::wrap_test, request_test_docstring)
+      ;
+  }
+
+  implicitly_convertible<request, request_with_value>();
 }
 
 } } } // end namespace boost::mpi::python

Modified: branches/release/libs/mpi/src/python/py_timer.cpp
==============================================================================
--- branches/release/libs/mpi/src/python/py_timer.cpp	(original)
+++ branches/release/libs/mpi/src/python/py_timer.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -32,7 +32,7 @@
   using boost::python::arg;
   using boost::python::object;
   
-  class_<timer>("timer", timer_docstring)
+  class_<timer>("Timer", timer_docstring)
     .def(init<>())
     .def("restart", &timer::restart, timer_restart_docstring)
     .add_property("elapsed", &timer::elapsed, timer_elapsed_docstring)

Added: branches/release/libs/mpi/src/python/request_with_value.hpp
==============================================================================
--- (empty file)
+++ branches/release/libs/mpi/src/python/request_with_value.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,71 @@
+// (C) Copyright 2006 
+// Douglas Gregor <doug.gregor -at- gmail.com>
+// Andreas Kloeckner <inform -at- tiker.net>
+
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  Authors: Douglas Gregor, Andreas Kloeckner
+
+#ifndef BOOST_MPI_PYTHON_REQUEST_WITH_VALUE_HPP
+#define BOOST_MPI_PYTHON_REQUEST_WITH_VALUE_HPP
+
+#include <boost/python.hpp>
+#include <boost/mpi.hpp>
+
+namespace boost { namespace mpi { namespace python {
+
+  /** This wrapper adds a @c boost::python::object value to the @c
+   * boost::mpi::request structure, for the benefit of @c irecv() requests.
+   *
+   * In order to be able to return the value of his requests to the user, we
+   * need a handle that we can update to contain the transmitted value once the
+   * request completes. Since we're passing the address on to irecv to fill at
+   * any time in the future, this address may not change over time. 
+   *
+   * There are two possible cases: 
+   * - plain irecv()
+   * - skeleton-content irecv()
+   *
+   * In the first case, we need to own the storage from this object, the
+   * m_internal_value is used for this. In the second case, the updated
+   * python::object is part of a boost::mpi::python::content object: the
+   * m_external_value field handles this case. Furthermore, in the latter case,
+   * we now have a lifetime dependency on that content object; this can be
+   * handled with the BPL's with_custodian_and_ward facility.
+   *
+   * Since requests and request_with_value are supposed to be copyconstructible,
+   * we can't put the handle immediately inside this instance. Moreover, since
+   * we need to be able to put request_with_value inside request_vectors, any
+   * values we own must be held in a shared_ptr instance.
+   */
+
+  class request_with_value : public request 
+  { 
+    private:
+      boost::shared_ptr<boost::python::object> m_internal_value;
+      boost::python::object *m_external_value;
+
+    public:
+      request_with_value()
+        : m_external_value(0)
+      { }
+      request_with_value(const request &req)
+        : request(req), m_external_value(0)
+      { }
+
+      const boost::python::object get_value() const;
+      const boost::python::object get_value_or_none() const;
+
+      const boost::python::object wrap_wait();
+      const boost::python::object wrap_test();
+
+      friend request_with_value communicator_irecv(const communicator &, int, int);
+      friend request_with_value communicator_irecv_content(
+          const communicator&, int, int, content&);
+  };
+
+} } }
+
+#endif

Modified: branches/release/libs/mpi/src/python/skeleton_and_content.cpp
==============================================================================
--- branches/release/libs/mpi/src/python/skeleton_and_content.cpp	(original)
+++ branches/release/libs/mpi/src/python/skeleton_and_content.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -16,6 +16,7 @@
 #include <typeinfo>
 #include <list>
 #include "utility.hpp"
+#include "request_with_value.hpp"
 
 using namespace boost::python;
 using namespace boost::mpi;
@@ -114,14 +115,12 @@
 /// Receive the content of a Python object. The request object's value
 /// attribute will reference the object whose content is being
 /// received, not the content wrapper.
-object 
+request_with_value
 communicator_irecv_content(const communicator& comm, int source, int tag,
-                           const content& c)
+                           content& c)
 {
-  using boost::python::make_tuple;
-
-  object req(comm.irecv(source, tag, c.base()));
-  req.attr("value") = c.object;
+  request_with_value req(comm.irecv(source, tag, c.base()));
+  req.m_external_value = &c.object;
   return req;
 }
 
@@ -140,7 +139,7 @@
   // Expose the object_without_skeleton exception
   object type = 
     class_<object_without_skeleton>
-      ("object_without_skeleton", object_without_skeleton_docstring, no_init)
+      ("ObjectWithoutSkeleton", object_without_skeleton_docstring, no_init)
       .def_readonly("object", &object_without_skeleton::value,
                     object_without_skeleton_object_docstring)
       .def("__str__", &object_without_skeleton_str)
@@ -150,11 +149,11 @@
   // Expose the Python variants of "skeleton_proxy" and "content", and
   // their generator functions.
   detail::skeleton_proxy_base_type = 
-    class_<skeleton_proxy_base>("skeleton_proxy", skeleton_proxy_docstring, 
+    class_<skeleton_proxy_base>("SkeletonProxy", skeleton_proxy_docstring, 
                                 no_init)
       .def_readonly("object", &skeleton_proxy_base::object,
                     skeleton_proxy_object_docstring);
-  class_<content>("content", content_docstring, no_init);
+  class_<content>("Content", content_docstring, no_init);
   def("skeleton", &skeleton, arg("object"), skeleton_docstring);
   def("get_content", &get_content, arg("object"), get_content_docstring);
 
@@ -166,7 +165,9 @@
          (arg("source") = any_source, arg("tag") = any_tag, arg("buffer"), 
           arg("return_status") = false))
     .def("irecv", communicator_irecv_content,
-         (arg("source") = any_source, arg("tag") = any_tag, arg("buffer")));
+         (arg("source") = any_source, arg("tag") = any_tag, arg("buffer")),
+         with_custodian_and_ward_postcall<0, 4>()
+         );
 }
 
 } } } // end namespace boost::mpi::python

Modified: branches/release/libs/mpi/src/python/status.cpp
==============================================================================
--- branches/release/libs/mpi/src/python/status.cpp	(original)
+++ branches/release/libs/mpi/src/python/status.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -30,7 +30,7 @@
   using boost::python::arg;
   using boost::python::object;
   
-  class_<status>("status", status_docstring, no_init)
+  class_<status>("Status", status_docstring, no_init)
     .add_property("source", &status::source, status_source_docstring)
     .add_property("tag", &status::tag, status_tag_docstring)
     .add_property("error", &status::error, status_error_docstring)

Modified: branches/release/libs/mpi/test/broadcast_test.cpp
==============================================================================
--- branches/release/libs/mpi/test/broadcast_test.cpp	(original)
+++ branches/release/libs/mpi/test/broadcast_test.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -55,7 +55,6 @@
   using boost::mpi::get_content;
   using boost::make_counting_iterator;
   using boost::mpi::broadcast;
-  using boost::mpi::content;
   using boost::mpi::get_content;
 
   typedef std::list<int>::iterator iterator;

Modified: branches/release/libs/serialization/build/Jamfile.v2
==============================================================================
--- branches/release/libs/serialization/build/Jamfile.v2	(original)
+++ branches/release/libs/serialization/build/Jamfile.v2	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,28 +8,46 @@
 
 project boost/serialization
     : source-location ../src
-    ;
+    : requirements <dependency>../../config/test//BOOST_NO_STD_LOCALE
+      <conditional>@include-spirit
+;
 
+SPIRIT_ROOT = [ modules.peek : SPIRIT_ROOT ] ;
 rule include-spirit ( properties * )
 {
+    local old-compiler ;
+    if <toolset>borland in $(properties)
+    {
+        old-compiler = true ;
+    }
+    else if <toolset>msvc in $(properties)
+    {
+        if <toolset-msvc:version>6.5 in $(properties)
+          || <toolset-msvc:version>7.0 in $(properties)
+        {            
+            old-compiler = true ;
+        }        
+    }
+        
     local result ;
-    local SPIRIT_ROOT = [ modules.peek : SPIRIT_ROOT ] ;
-    for local tset in borland { # vc iw
-        if ( <toolset>$(tset) in $(properties) ) {
-            if ( $(SPIRIT_ROOT) ) {
-                result = <cxxflags>-I$(SPIRIT_ROOT) ;
-            }
-            else {
-                echo **** spirit 1.6x required to build library with this compiler **** ;
-                result = <build>no ;
-
-            }
+    if $(old-compiler)
+    {        
+        if $(SPIRIT_ROOT)
+        {
+            # note - we can't use <include>$(SPIRIT_ROOT) because 
+            # it puts -I$(SPIRIT_ROOT) AFTER the "../../.." in the command line.
+            # so use these instead 
+            result = <cxxflags>-I$(SPIRIT_ROOT) ;
         }
-    }
+        else 
+        {
+            echo **** spirit 1.6x required to build library with this compiler **** ;
+            result = <build>no ;
+        }
+    }    
     return $(result) ;
 }
 
-
 SOURCES = 
     basic_archive
     basic_iarchive
@@ -44,10 +62,9 @@
     basic_xml_archive
     binary_iarchive
     binary_oarchive
-    codecvt_null
     extended_type_info
-    extended_type_info_no_rtti
     extended_type_info_typeid
+    extended_type_info_no_rtti
     polymorphic_iarchive
     polymorphic_oarchive
     stl_port
@@ -62,28 +79,29 @@
 WSOURCES = 
     basic_text_wiprimitive
     basic_text_woprimitive
-    binary_wiarchive
-    binary_woarchive
     text_wiarchive
     text_woarchive
     utf8_codecvt_facet
     xml_wgrammar
     xml_wiarchive
     xml_woarchive
+    codecvt_null
 ;
 
+
 lib boost_serialization 
-        : $(SOURCES).cpp
-	: <toolset>msvc:<cxxflags>/Gy 
-	  <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
-          <conditional>@include-spirit
-	;
+    : $(SOURCES).cpp
+    : 
+    <toolset>msvc:<cxxflags>/Gy
+    <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
+    ;
 
 lib boost_wserialization 
-        : $(WSOURCES).cpp boost_serialization 
-        : <toolset>msvc:<cxxflags>/Gy 
-	  <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1	
-          <conditional>@include-spirit
-	;
+    : $(WSOURCES).cpp boost_serialization 
+    :     
+    <toolset>msvc:<cxxflags>/Gy 
+    <dependency>../../config/test//BOOST_NO_STD_WSTREAMBUF
+    <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
+    ;
 
-boost-install boost_serialization boost_wserialization ;
\ No newline at end of file
+boost-install boost_serialization boost_wserialization ;

Deleted: branches/release/libs/serialization/build/serialization.jam
==============================================================================
--- branches/release/libs/serialization/build/serialization.jam	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
+++ (empty file)
@@ -1,126 +0,0 @@
-# Boost serialization Library Build Jamfile
-#  (C) Copyright Robert Ramey 2002-2004.
-#  Use, modification, and distribution are subject to the 
-#  Boost Software License, Version 1.0. (See accompanying file 
-#  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#
-#  See http://www.boost.org/libs/serialization for the library home page.
-
-# building this library needs a working version of spirit
-rule toolset::require-boost-spirit-support ( toolset variant : subvariant-path properties * )
-{
-    local requires-spirit = false ;
-    switch $(toolset) {
-    case "borland*" :
-        requires-spirit = true ;
-    case "msvc*" :
-        requires-spirit = true ;
-    case "iw*" :
-        requires-spirit = true ;
-    case "vc-6*" :
-        requires-spirit = true ;
-    case "vc7*" :
-        requires-spirit = true ;
-    case "vc-7_0*" :
-        requires-spirit = true ;
-    case "gcc-2*" :
-        requires-spirit = true ;
-    }
-    if $(requires-spirit) = true {
-        if  $(SPIRIT_ROOT) # && ( exist $(SPIRIT_ROOT) )
-        {
-            properties += <include>$(SPIRIT_ROOT) ;
-        }
-        else {
-            echo **** spirit 1.6x required to build library with this compiler **** ;
-            properties = [ impose-requirements $(properties) : <build>no ] ;
-        }
-    }
-    return $(subvariant-path) $(properties) ;
-}
-
-# certain tool sets are known apriori not to support wide char i/o
-rule toolset::require-wide-char-io-support ( toolset variant : subvariant-path properties * )
-{
-    switch $(toolset) {
-    case "*cygwin" :
-        echo **** wide char i/o not supported by cygwin gcc library **** ;
-        properties = [ impose-requirements $(properties) : <build>no ] ;
-
-    case "como*" :
-        echo **** wide char i/o not supported by libcomo standard library **** ;
-        properties = [ impose-requirements $(properties) : <build>no ] ;
-    case "mingw*" :
-        if ! [ MATCH "^([5][.][0])$" : [ get-values <stlport-version> : $(properties) ] ]
-        {
-            echo **** wide char i/o not supported by the mingw standard library **** ;
-            properties = [ impose-requirements $(properties) : <build>no ] ;
-        }
-    }
-    return $(subvariant-path) $(properties) ;
-}
-
-# certain tool sets are known apriori not to support creation of DLLS
-rule toolset::require-shared-libraries-support ( toolset variant : subvariant-path properties * )
-{
-    switch $(toolset) {
-    case "como*" :
-        echo **** DLLs cannot be built with this compiler **** ;
-        properties = [ impose-requirements $(properties) : <build>no ] ;
-    case "msvc-stlport*" :
-        echo **** DLLs cannot be built with this compiler and stlport 4.x **** ;
-        properties = [ impose-requirements $(properties) : <build>no ] ;
-    case "vc-6_5-stlport*" :
-        echo **** DLLs cannot be built with this compiler and stlport 4.x **** ;
-        properties = [ impose-requirements $(properties) : <build>no ] ;
-    case "cw*" :
-        local runtime-link = [ get-values <runtime-link> : $(properties) ] ;
-        if static in $(runtime-link) {
-            echo **** DLLS cannot be built with static runtime linking **** ;
-            properties = [ impose-requirements $(properties) : <build>no ] ;
-        }
-
-    }
-    return $(subvariant-path) $(properties) ;
-}
-
-# certain tool sets display warnings which are not applicable to the serialization library
-rule toolset::suppress-warnings ( toolset variant : subvariant-path properties * )
-{
-    switch $(toolset) {
-    case "vc-8*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-wd4996" ] ;    
-    case "*cygwin*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-Wno-non-virtual-dtor -Wno-ctor-dtor-privacy" ] ;
-    case "gcc*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-Wno-non-virtual-dtor -Wno-ctor-dtor-privacy" ] ;
-    case "mingw*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-Wno-non-virtual-dtor -Wno-ctor-dtor-privacy" ] ;
-    case "borland*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-w-8080 -w-8071 -w-8057 -w-8062 -w-8008 -w-0018 -w-8066" ] ;
-    }
-    return $(subvariant-path) $(properties) ;
-}
-
-# set optimization switches for certain toolsets. We do it here rather than in the
-# Jamfile requirements because here we can use a regex for the compiler name.
-rule toolset::optimizations ( toolset variant : subvariant-path properties * )
-{
-    switch $(toolset) {
-    case "vc*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-Gy" ] ;    
-    case "msvc*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-Gy" ] ;
-    case "gcc*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-ftemplate-depth-255" ] ;
-    case "qcc*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-ftemplate-depth-255" ] ;
-    case "QCC*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-ftemplate-depth-255" ] ;
-    case "mingw*" :
-        properties = [ impose-requirements $(properties) : <cxxflags>"-ftemplate-depth-255" ] ;
-    }
-    return $(subvariant-path) $(properties) ;
-}
-
-

Modified: branches/release/libs/serialization/doc/acknowledgments.html
==============================================================================
--- branches/release/libs/serialization/doc/acknowledgments.html	(original)
+++ branches/release/libs/serialization/doc/acknowledgments.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -30,10 +30,10 @@
   <li>David Abrahams improved implementation of "export" functionality.  This not
   only eliminated an annoying header sequencing requirement, but also the need to maintain
   a list of "known archives".
-  <li>Mattias Troyer ehnanced the implementation of native binary archives.  This includes
+  <li>Mattias Troyer enhanced the implementation of native binary archives.  This includes
   enhancement and generalization of the library itself including generalization of
   the wrapper concept.
-  <li>Markus Schöpflin tracked down issues with TRU64 compiler resulting in 100% passing.
+  <li>Markus Sch&ouml;pflin tracked down issues with TRU64 compiler resulting in 100% passing.
   <li><a href="mailto::troy_at_[hidden]"> Troy D. Straszheim</a> made the initial version of variant serialization.
   <li>Tonko Juricic helped refine and complete project files for VC 7.1 ide
   <li>Rene Rivera tracked down several issues related to 

Modified: branches/release/libs/serialization/doc/archive_reference.html
==============================================================================
--- branches/release/libs/serialization/doc/archive_reference.html	(original)
+++ branches/release/libs/serialization/doc/archive_reference.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -34,30 +34,41 @@
 <h3><a name="implementation">Implementation</a></h3>
 The Archive concept specifies the functions that a
 class must implement to in order to be used to serialize 
-Serializable types. 
+Serializable types.
+
+ 
 The library implements a family of archives appropriate for different purposes.  
-This section describes how they have been implemented and how one can implement his own archive class.
+This section describes how they have been implemented and one way one 
+can implement his own archive class.
+
 Our discussion will focus on archives used for loading as the hierarchy is exactly analogous
 for archives used for saving data.
+
+
 <p>
 Our archives have been factored in to a tree of classes in order to minimize
 repetition of code.  This is shown in the accompanying 
 <a target="class_diagram" href="class_diagram.html">class diagram</a>.
-All input archives should be derived from the following template:
+
+Any class which fullfills the following requirements will function as
+a loading archive.
+
+
+<h4>Minimum Requirments</h4>
+The archive class is derived from:
 <pre><code>
 template&lt;class Archive&gt;
 detail::common_iarchive;
 </code></pre>
-<h4>Minimum Requirments</h4>
 An instance of the this template handles all the "bookkeeping" associated
 with serialization. In order to be a functional only the following additional
-functions <strong>must</strong> be defined:
+functions <strong>must</strong> be declared:
 <dl>
 <dt><h4><code>void load(T &t);</code></h4></dt>
 <dd>
 This function must be implemented for all primitive data types.  This can be
-accomplished through the use of a member template or explict declarations
-for all prmititive types.
+accomplished through the use of a member template or explicit declarations
+for all primitive types.
 </dd>
 
 <dt><h4><code>void load_binary(void *address, std::size_t size);</code></h4></dt>
@@ -81,13 +92,12 @@
 <a href="../../../boost/archive/detail/common_iarchive.hpp" target="common_iarchive_hpp">
 #include &lt;boost/archive/detail/common_iarchive.hpp&gt;
 </a>
-
 /////////////////////////////////////////////////////////////////////////
 // class trivial_iarchive - read serialized objects from a input text stream
 class trivial_iarchive : 
     public boost::archive::detail::common_iarchive&lt;trivial_iarchive&gt;
 {
-    // permit serialization system priviledged access to permit
+    // permit serialization system privileged access to permit
     // implementation of inline templates for maximum speed.
     friend class boost::archive::load_access;
 
@@ -143,7 +153,7 @@
 <dd>
 <strong>Default</strong>:Does nothing.<br>
 <strong>Purpose</strong>:Called <strong>each time</strong> user data is saved. 
-Its not called when archive book keeping data is saved.  This is used by XML archives 
+It's not called when archive book keeping data is saved.  This is used by XML archives 
 to determine  when to inject a "&gt;" character at end of XML header. XML output archives 
 keep their own internal flag indicating that data being written is header data. This
 internal flag is reset when an object start tag is written. When 
@@ -226,7 +236,9 @@
     all data objects.
     <li>Addressing any of the above may generate more issues to be addressed.
     <li>The archives included with library are all templates which use a
-    <code style="white-space: normal">stream</code> as a template parameter rather than simple classes.
+    <code style="white-space: normal">stream</code> or
+    <code style="white-space: normal">streambuf</code>
+    as a template parameter rather than simple classes.
     Combined with the above, even more issues arise with non-conforming compilers.
 </ul>
 The attached <a target="class_diagram" href="class_diagram.html">class diagram</a>
@@ -241,17 +253,15 @@
 <ul>
     <li>Instances of a derived class are serialized through a base class pointer.
     <li>Such instances are not "registered" neither implicitly nor explicitly. That
-    is, the macro <code style="white-space: normal">BOOT_CLASS_EXPORT</code> is used to instantiate the serialization
-    code for the included archives.
+    is, the macro <code style="white-space: normal">BOOT_CLASS_EXPORT</code> is used 
+    to instantiate the serialization code for the included archives.
 </ul>
-The problem here is that BOOT_CLASS_EXPORT only generates code for those archives
-included with the library - not those added subsequently.  To generate code for
-newly created archive classes, the following should be used.
+
+To make this work, the following should be included after the archive
+class definition.
 <pre><code>
-#define BOOST_ARCHIVE_CUSTOM_OARCHIVE_TYPES trivial_oarchive
-#define BOOST_ARCHIVE_CUSTOM_IARCHIVE_TYPES trivial_iarchive
+#define BOOST_SERIALIZATION_REGISTER_ARCHIVE(Archive)
 </code></pre>
-before <code style="white-space: normal">BOOST_CLASS_EXPORT</code> is invoked for any serializable class.
 Failure to do this will not inhibit the program from compiling, linking
 and executing properly - except in one case.  If an instance of a derived
 class is serialized through a pointer to its base class, the program
@@ -259,8 +269,7 @@
 <a href="exceptions.html#unregistered_class"><code style="white-space: normal">unregistered_class</code></a>
 exception.
 <p>
-Only one of the above statements is permitted, However, any number of new archive
-classes can be specified as list separated by commas.
+
 
 <h4><a name="testing">Testing</h4>
 Exhaustive testing of the library requires testing the different aspects of object
@@ -302,16 +311,16 @@
 #define TEST_STREAM_FLAGS (std::ios_base::openmode)0
 </code></pre>
 
-To test a new archive, for example, portable binary archives, make a
-header file <code style="white-space: normal">portable_binary_archive.hpp</code>
+To test a new archive, for example, portable binary archives, with the gcc compiler, 
+make a header file <code style="white-space: normal">portable_binary_archive.hpp</code>
 and invoke <code style="white-space: normal">bjam</code> with
 <pre><code> 
 -sBOOST_ARCHIVE_LIST=portable_binary_archive.hpp
 </code></pre>
-This process in encapsulated in the shell script 
-<code style="white-space: normal">run_archive_test</code> whose command line is
+This process in encapsulated in the shell or cmd script 
+<code style="white-space: normal">library_test</code> whose command line is
 <pre><code>
-run_archive_test &lt;test header file&gt; &lt;toolset&gt; [&lt;boost root&gt;] [&lt;target directory&gt;]
+library_test --toolset=gcc -sBOOST_ARCHIVE_LIST=portable_binary_archive.hpp
 </code></pre>
 <h3><a name="polymorphic">Polymorphic Archives</a></h3>
 
@@ -367,9 +376,9 @@
 and the header files, this implementation is just a composition of the polymorphic
 interface and the standard template driven implementation.  This composition is
 accomplished by the templates
-<a target=polymorphic_iarchive_dispatch_hpp href="../../../boost/archive/detail/polymorphic_iarchive_dispatch.hpp"><code style="white-space: normal">polymorphic_iarchive_dispatch.hpp</code></a>
+<a target=polymorphic_iarchive_route_hpp href="../../../boost/archive/detail/polymorphic_iarchive_route.hpp"><code style="white-space: normal">polymorphic_iarchive_route.hpp</code></a>
 and
-<a target=polymorphic_oarchive_dispatch_hpp href="../../../boost/archive/detail/polymorphic_oarchive_dispatch.hpp"><code style="white-space: normal">polymorphic_oarchive_dispatch.hpp</code></a>.
+<a target=polymorphic_oarchive_route_hpp href="../../../boost/archive/detail/polymorphic_oarchive_route.hpp"><code style="white-space: normal">polymorphic_oarchive_route.hpp</code></a>.
 As these contain no code specific to the particular implementation archive, they can be used to create
 a polymorphic archive implementation from any functioning templated archive implementation.
 <p>

Modified: branches/release/libs/serialization/doc/archives.html
==============================================================================
--- branches/release/libs/serialization/doc/archives.html	(original)
+++ branches/release/libs/serialization/doc/archives.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -41,14 +41,14 @@
 <h4><a name="saving_interface">Saving Archive Concept</a></h4>
 <h4>Associated Types</h4>
 Intuitively, a type modeling this concept will generate a sequence of bytes
-correpsonding to an arbitrary set of C++ data structures.  Each type modeling the
+corresponding to an arbitrary set of C++ data structures.  Each type modeling the
 Saving Archive concept (SA) may be associated with another type modeling the
 <a href="#loading_interface">Loading Archive Concept</a>(LA).  
 This associated type will perform the inverse operation.  
 That is, given a sequence of bytes generated by SA, it will generate a set of 
-C++ data structures the is equivalent to the original.  
+C++ data structures that is equivalent to the original.  
 The notion of equivalence is defined by the implementations of the pair of archives and the
-way the data is are rendered serializable.
+way the data are rendered serializable.
 <p>
 <h4>Valid Expressions</h4>
 <dl>
@@ -190,8 +190,8 @@
     moved to address v.
     <p>
     When an object is loaded to a temporary variable and later moved to another location,
-    This function must be called in order communicate this fact.  This is permits the
-    the archive to properly implement object tracking.  Object tracking is required in order
+    this function must be called in order communicate this fact.  This permits the
+    archive to properly implement object tracking.  Object tracking is required in order
     to correctly implement serialization of pointers to instances of derived classes.
   </dd>  
   <dt><h4><code>
@@ -215,7 +215,7 @@
 
 <p>
 The existence of the <code style="white-space: normal">&lt;&lt;</code> 
-and <code style="white-space: normal">&gt;&gt;</code> suggest
+and <code style="white-space: normal">&gt;&gt;</code> suggests
 a relationship between archives and C++ i/o streams. <strong>Archives are not 
 C++ i/o streams</strong>. All the archives included with this system take a stream
 as an argument in the constructor and that stream is used for output or input.
@@ -224,7 +224,7 @@
 found it useful to base their implementation on streams.
 
 <h3><a name="archive_models">Archive Models</a></h3>
-This library includes a various implementation of the Archive concept.
+This library includes various implementations of the Archive concept.
 
 An archive is defined by two complementary classes.  One is for saving data while
 the other is for loading it.
@@ -307,7 +307,7 @@
 text_oarchive(std::ostream & os, unsigned int flags = 0);
 </code></h4></dt>
 <dd>
-Contructs an archive given an open <code style="white-space: normal">stream</code> as 
+Constructs an archive given an open <code style="white-space: normal">stream</code> as 
 an argument and optional flags. For most applications there will be no need to use flags. 
 Flags are defined by <code style="white-space: normal">enum archive_flags</code> enumerator. 
 Multiple flags can be combined with the <code style="white-space: normal">|</code> operator. 
@@ -339,7 +339,7 @@
 <dd>
 Destructor for an archive.  This should be called before the stream is
 closed.  It restores any altered stream facets to their state before the
-the archive was opened.
+archive was opened.
 </dd>
 
 </dl>
@@ -402,12 +402,12 @@
 
 <h3><a name="exceptions">Exceptions</h3>
 All of the archive classes included may throw exceptions.  The list of exceptions that might
-be throw can be found in section <a target="detail" href="exceptions.html">Archive Exceptions</a>
+be thrown can be found in section <a target="detail" href="exceptions.html">Archive Exceptions</a>
 of this documentation. 
 
 <h3><a name="charactersets">Character Sets</h3>
 This library includes two archive classes for XML. The wide character
-version (<code style="white-space: normal">xml_w?archive</code>) renders it output as UTF-8 which can
+version (<code style="white-space: normal">xml_w?archive</code>) renders its output as UTF-8 which can
 handle any wide character without loss of information. 
 <code style="white-space: normal">std::string</code> data is converted from multi-byte format to wide
 character format using the current <code style="white-space: normal">

Modified: branches/release/libs/serialization/doc/class_diagram.html
==============================================================================
--- branches/release/libs/serialization/doc/class_diagram.html	(original)
+++ branches/release/libs/serialization/doc/class_diagram.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -52,14 +52,14 @@
       |     /                                                |
       |   /                                                  |
       | /                                                    |
-<font color="blue">text_iarchive_impl&lt;text_iarchive&gt;</font> ->                 <font color="red">polymorphic_iarchive</font> ->
+<font color="blue">text_iarchive_impl&lt;text_iarchive&gt;</font> ->              polymorphic_iarchive_impl ->
       | \                                                    |
       |   \                                                  |
-      |     \_____________________________________           |
+      |     \_____________________________________    <font color="red">polymorphic_iarchive</font> ->
       |                                           \         /
       |                                             \     /
       |                                               \ /  
-<font color="red">text_iarchive</font> ->                 polymorphic_iarchive_dispatch&lt;text_iarchive_impl&lt;text_iarchive&gt; &gt; ->
+<font color="red">text_iarchive</font> ->                 polymorphic_iarchive_route&lt;text_iarchive_impl&lt;text_iarchive&gt; &gt; ->
                                                        |
                                                        |
                                                        |
@@ -68,7 +68,7 @@
 
 </code></pre>
 This diagram shows the relationship between the various classes that implement loading (input
-serialization) for text files.  The hierachy and organization is identical for saving and for
+serialization) for text files.  The hierachy and organization is similar for saving and for
 other types of archives as well.  In the diagram, classes written in <font color="blue">blue</font> 
 implement loading for a given archive type. (in this case its text archives).
 Users include classes in <font color="red">red</font> to load their data from a partcular
@@ -146,11 +146,11 @@
   for all archives present and future.
   
   <p><dt><code>
-  polymorphic_iarchive_dispatch<text_iarchive_impl<text_iarchive> >
+  polymorphic_iarchive_route<text_iarchive_impl<text_iarchive> >
   </code></dt>
   <dd><p>
   This class implements the <code style="white-space: normal">polymorphic_iarchive</code> in terms of a specific 
-  concrete class.  Virtual function calls are forwarded to the implementing class.  In this example, 
+  concrete class.  Virtual function calls are routed to the implementing class.  In this example, 
   that implementing class would be text_iarchive_impl.
   
   <p><dt><code>
@@ -158,7 +158,7 @@
   </code></dt>
   <dd>
   this is just a typedef so we can write polymorphic_text_archive rather than
-  <code style="white-space: normal">polymorphic_iarchive_dispatch&lt;text_iarchive_impl&lt;text_iarchive&gt; &gt;</code>
+  <code style="white-space: normal">polymorphic_iarchive_route&lt;text_iarchive_impl&lt;text_iarchive&gt; &gt;</code>
   
 </dl>
 <hr>

Modified: branches/release/libs/serialization/doc/codecvt.html
==============================================================================
--- branches/release/libs/serialization/doc/codecvt.html	(original)
+++ branches/release/libs/serialization/doc/codecvt.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -28,7 +28,7 @@
 <a name="sec:utf8-codecvt-facet-class"></a>
 
 
-<h1>UTF-8 Codecvt Facet</h1>
+<h1><code>utf8_codecvt_facet</code></h1>
 
 
 <pre>

Modified: branches/release/libs/serialization/doc/contents.html
==============================================================================
--- branches/release/libs/serialization/doc/contents.html	(original)
+++ branches/release/libs/serialization/doc/contents.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,4 +1,4 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!--
 (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . 
@@ -87,9 +87,10 @@
     <dt><img style="display:none" src="plus.gif" id="release_notes"><a target="detail" href="release.html">Release Notes</a></dt>
     <dd><div id="release_notes_detail"><dl class="page-index">
       <dt><img style="display:none" src="dot.gif"><a target="detail"  href="release.html#requirements">Requirements</a></dt>
+      <dt><img style="display:none" src="dot.gif"><a target="detail"  href="release.html#difference_1_35">Differences from version 1.35</a></dt>
+      <dt><img style="display:none" src="dot.gif"><a target="detail"  href="release.html#difference_1_34">Differences from version 1.34</a></dt>
       <dt><img style="display:none" src="dot.gif"><a target="detail"  href="release.html#difference_1_32">Differences from version 1.32</a></dt>
       <dt><img style="display:none" src="dot.gif"><a target="detail"  href="release.html#difference_1_33">Differences from version 1.33</a></dt>
-      <dt><img style="display:none" src="dot.gif"><a target="detail"  href="release.html#difference_1_34">Differences from version 1.34</a></dt>
       <dt><img style="display:none" src="dot.gif"><a target="detail"  href="release.html#todo">Pending Issues</a></dt>
     </dl></div></dd>
     <dt><img style="display:none" src="plus.gif" id="overview"><a target="detail" href="overview.html">Overview</a></dt>
@@ -148,6 +149,7 @@
           <dt><img style="display:none" src="plus.gif" id="derivedpointers"><a target="detail" href="serialization.html#derivedpointers">Pointers to Objects of Derived Classes</a>
           <dd><div id="derivedpointers_detail"><dl class="page-index">
             <dt><img style="display:none" src="dot.gif"><a target="detail" href="serialization.html#registration">Registration</a>
+            <dt><img style="display:none" src="dot.gif"><a target="detail" href="serialization.html#export">Export</a>
             <dt><img style="display:none" src="dot.gif"><a target="detail" href="serialization.html#instantiation">Instantiation</a>
             <dt><img style="display:none" src="dot.gif"><a target="detail" href="serialization.html#selectivetracking">Selective Tracking</a>
             <dt><img style="display:none" src="dot.gif"><a target="detail" href="serialization.html#runtimecasting">Runtime Casting</a>
@@ -179,7 +181,6 @@
       <dt><img style="display:none" src="plus.gif" id="special"><a target="detail" href="special.html">Special Considerations</a>
       <dd><div id="special_detail"><dl class="page-index">
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#objecttracking">Object Tracking</a>
-        <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#export">Exporting Class Serialization</a>
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#classinfo">Class Information</a>
         <dt><img style="display:none" src="plus.gif" id="portability"><a target="detail" href="special.html#portability">Archive Portability</a>
         <dd><div id="portability_detail"><dl class="page-index">
@@ -188,7 +189,9 @@
         </dl></div></dd>
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#binary_archives">Binary Archives</a>
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#xml_archives">XML Archives</a>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#export">Exporting Class Serialization</a>
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#dlls">DLLS - Serialization and Runtime Linking</a>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#plugins">Plugins</a>
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#multi_threading">Multi-Threading</a>
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#optimizations">Optimzations</a>
         <dt><img style="display:none" src="plus.gif" id="exceptions"><a target="detail" href="exceptions.html">Archive Exceptions</a>
@@ -262,8 +265,8 @@
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="pimpl.html">PIMPL</a>
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="derivation.html">Derivation from an Existing Archive Class</a>
     </dl></div></dd>
-    <dt><img style="display:none" src="plus.gif" id="miscellaneous">Miscellaneous
-    <dd><div id="miscellaneous_detail"><dl class="page-index">
+    <dt><img style="display:none" src="plus.gif" id="otherclasses">Other Classes
+    <dd><div id="otherclasses_detail"><dl class="page-index">
       <dt><img style="display:none" src="plus.gif" id="extended_type_info"><a target="detail" href="extended_type_info.html"><code>extended_type_info</code></a>
       <dd><div id="extended_type_info_detail"><dl class="page-index">
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="extended_type_info.html#motivation">Motivation</a>
@@ -272,12 +275,21 @@
         <dt><img style="display:none" src="dot.gif"><a target="detail" href="extended_type_info.html#models">Models</a>
       </dl></div></dd>
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="void_cast.html"><code>void_cast</code></a>
-      <dt><img style="display:none" src="dot.gif"><a target="detail" href="codecvt.html">utf-8 code_cvt</a>
+      <dt><img style="display:none" src="dot.gif"><a target="detail" href="codecvt.html"><code>utf8_codecvt_facet</code></a>
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="strong_typedef.html"><code>BOOST_STRONG_TYPEDEF</code></a>
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="state_saver.html"><code>state_saver</code></a>
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="dataflow.html">Dataflow Iterators</a>
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="smart_cast.html"><code>smart_cast</code></a>
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="static_warning.html"><code>BOOST_STATIC_WARNING</code></a>
+      <dt><img style="display:none" src="plus.gif" id="singleton"><a target="detail" href="singleton.html"><code>singleton</code></a>
+      <dd><div id="singleton_detail"><dl class="page-index">
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="singleton.html#motivation">Motivation</a>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="singleton.html#features">Features</a>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="singleton.html#classinterface">Class Interface</a>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="singleton.html#requirements">Requirements</a>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="singleton.html#examples">Examples</a>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="singleton.html#multithreading">Multi-Threading</a>
+      </dl></div></dd>
     </dl></div></dd>
     <!--
     <dt><img style="display:none" src="dot.gif"><a target="detail" href="configuration.html">Configuration Information</a></dt>
@@ -289,6 +301,23 @@
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="rationale.html#typeid"><code style="white-space: normal">typeid</code> information is not included in archives</a></dt>
       <dt><img style="display:none" src="dot.gif"><a target="detail" href="rationale.html#trap">Compile time trap when saving a non-const value</a></dt>
     </dl></div></dd>
+
+    <dt><img style="display:none" src="plus.gif" id="todo"><a target="detail" href="todo.html">To Do</a></dt>
+    <dd><div id="todo_detail"><dl class="page-index">
+      <dt><img style="display:none" src="dot.gif"><a target="detail" href="todo.html#portablebinaryarchive">Portable Binary Archive</a></dt>
+      <dt><img style="display:none" src="dot.gif"><a target="detail" href="todo.html#performancetesting">Performance Testing and Profiling</a></dt>
+      <dt><img style="display:none" src="dot.gif"><a target="detail" href="todo.html#backversioning">Back Versioning</a></dt>
+      <dt><img style="display:none" src="dot.gif"><a target="detail" href="todo.html#nortti">Environments without RTTI</a></dt>
+
+      <dt><img style="display:none" src="plus.gif" id="newcasestudies"><a target="detail" href="new_case_studies.html">Proposed Case Studies</a></dt>
+      <dd><div id="newcasestudies_detail"><dl class="page-index">
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="new_case_studies.html#functionobject">Serializing a Function Object</a></dt>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="new_case_studies.html#archiveadaptor">Archive Adaptors</a></dt>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="new_case_studies.html#archivehelper">Archive Helpers</a></dt>
+      </dl></div></dd>
+
+    </dl></div></dd>
+
     <dt><img style="display:none" src="dot.gif"><a target="detail" href="history.html">History</a>
     <!--
     <dt><img style="display:none" src="dot.gif"><a target="detail" href="definitions.html">Definitions</a></dt>

Modified: branches/release/libs/serialization/doc/exceptions.html
==============================================================================
--- branches/release/libs/serialization/doc/exceptions.html	(original)
+++ branches/release/libs/serialization/doc/exceptions.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -43,8 +43,9 @@
 Archive operators can throw a <code style="white-space: normal">boost::archive_exception</code>
 object which can be caught by an application program.  These exceptions are defined
 in the files <a target="archive_exception_hpp" href="../../../boost/archive/archive_exception.hpp">
-boost/archive/archive_exception.hpp</a> and <a target="archive_xml_exception_hpp" href="../../../boost/archive/archive_exception.hpp">
-boost/archive/archive_xml_exception.hpp</a>.
+archive_exception.hpp</a>
+and <a target="basic_xml_archive_hpp" href="../../../boost/archive/basic_xml_archive.hpp">
+basic_xml_archive.hpp</a>.
 <pre><code>
 namespace boost {
 namespace archive {

Modified: branches/release/libs/serialization/doc/extended_type_info.html
==============================================================================
--- branches/release/libs/serialization/doc/extended_type_info.html	(original)
+++ branches/release/libs/serialization/doc/extended_type_info.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -33,7 +33,6 @@
   <dt>Example
 </dl>
 
-
 <h3><a name="motivation">Motivation</a></h3>
 The serialization library needs a system like 
 <code style="white-space: normal">type_info/typeid()</code> to perform
@@ -63,108 +62,92 @@
     name spaces is an accepted method used to avoid name space conflicts.
     Thus the namespace::class_name can't be used as a key.
   <li>
-    We may want the ability to serialize objects through a base class even though
-    they have no <code style="white-space: normal">virtual</code> function.  That
-    is, objects of classes which are not polymorphic in the strict C++ sense.  This
-    is not supported by the standard system.
-  <li>
     There exists the possibility that different classes use different type id 
     mechanism.  The class header might include this information. If we want to 
     import class headers accross applications, its convenient that the type id
     mechanism support inter-operability accross different type id systems.
 </ul>
 <h3>Features</h3>
-<code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code> is an implementation
+<code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">
+extended_type_info</a></code> is an implementation
 of <code style="white-space: normal">std::type_info</code> functionality with the 
 following features:
 <ul>
   <li>
-    Maintains a global table of <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code> records - one for each type known
-    to the program.
+    Builds a set of <a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">
+    <code style="white-space: normal">extended_type_info</a></code> records - one for each type
+    serialized.
   <li>
-    permits association of an arbitrary key with a type.  Often this key would
+    permits association of an arbitrary string key with a type.  Often this key would
     be the class name - but it doesn't have to be.  This key is referred to as
     a GUID - Globally Unique IDentifier.  Presumably it should be unique in the universe.
     Typically this GUID would be in header files and be used to match type accross
-    applications.
+    applications.  The macro BOOST_CLASS_EXPORT can be invoked to associate a string
+    key with any known type.  We'll refer to these types as "exported types"
   <li>
     permits the "mixing" of type info systems.  For example, one class might use 
     <code style="white-space: normal">typeid()</code> to find the external identifier 
     of a class while another might not.
 </ul>
-The serialization system maintains two global tables.
-<ul>
-  <li>The first is a global type table. it has an entry for each type used.
-  Each entry is an instance of a class derived from 
-  <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>. This table is used
-  to retrieve the unique <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>
-  information for any given type.
-  <li>The second is global key table. It has an entry for each type which has been assigned a GUID string key.
-  This table is used to retrieve the unique 
-  <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code> given its GUID.
-</ul>
-This library includes two different type id systems:
-<ul>
-  <li>
-    <code style="white-space: normal"><a target="extended_type_info_typeid.hpp" href = "../../../boost/serialization/extended_type_info_typeid.hpp">extended_type_info_typeid</a></code>
-    which is implemented in terms of the standard
-    <code style="white-space: normal">typeid()</code>.
-  <li>
-    <code style="white-space: normal"><a target="extended_type_info_no_rtti.hpp" href="../../../boost/serialization/extended_type_info_no_rtti.hpp">extended_type_info_no_rtti</a></code>
-    which is implemented in a way that doesn't rely on the existence
-    RTTI.  However, it does require that all classes for which type id is to be used
-    be explictly assigned an external key - which otherwise would be optional.
-</ul>
+
+Exported types are maintained in a global table so that given a string key, the
+corresponding type can be found.  This facility is used by the serialization library
+in order to construct types serialized through a base class pointer.
 
 <h3><a name="runtime">Runtime Interface</a></h3>
 <pre><code">
 namespace boost { 
 namespace serialization {
 
-class BOOST_SERIALIZATION_DECL extended_type_info : 
-    private boost::noncopyable 
+class extended_type_info
 {
 protected:
-    extended_type_info(const char * type_info_key);
+    // this class can't be used as is. It's just the 
+    // common functionality for all type_info replacement
+    // systems.  Hence, make these protected
+    const char * m_key;
+    extended_type_info(const unsigned int type_info_key);
+    ~extended_type_info();
 public:
-    void self_register();
     void key_register(const char *key);
-    const char * get_key() const;
-
+    const char * get_key() const {
+        return m_key;
+    }
     bool operator<(const extended_type_info &rhs) const;
     bool operator==(const extended_type_info &rhs) const;
-    bool operator!=(const extended_type_info &rhs) const;
-
+    bool operator!=(const extended_type_info &rhs) const {
+        return !(operator==(rhs));
+    }
+    // for plugins
+    virtual void * construct(unsigned int count = 0, ...) const;
+    virtual void destroy(void const * const p) const;
     static const extended_type_info * find(const char *key);
-    static const extended_type_info * find(const extended_type_info * t);
 };
 
 } // namespace serialization 
 } // namespace boost
 </code></pre>
-
-There must be one and only one <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>
-instance created for each type. For this reason, this class is marked is derived from
-<code style="white-space: normal">boost::noncopyable</code>. 
-
+<p>
+Generally, there will be one and only one
+<code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>
+instance created for each type.  However, this is enforced only at the executable
+module level.  That is, if a program includes some shared libraries or DLLS,
+there may be more than one instance of this class correponding to a particular type.
+For this reason the comparison functions below can't just compare the addresses of 
+this instance but rather must be programmed to compare the the actual information 
+the instances contain.
 <dl>
 
 <dt><h4><pre><code>
-extended_type_info(const char * type_info_key);</code></pre></h4></dt>
-<dd>
-This constructor should be called by all derived classes. It should be passed
-a pointer to a const string which identifies the type id system being used.  This
-type id is used to distinguish among the various type id system that might be used
-and allow them to interoperate.
-</dd>
-
-<dt><h4><pre><code>
-void self_register();
+extended_type_info(unsigned int type_info_key);
 </code></pre></h4></dt>
 <dd>
-This function adds entry for an entry to the global type table.  It would usually be 
-called from the constructor of the derived class which implements the 
-<code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code> functionality.
+This constructor should be called by all derived classes.
+The argument should be the particular implementation. For
+this default implementation base on typeid(), this is the 
+value 1.  Each system must have its own integer.  This value
+is used to permit the inter-operability of different typeinfo
+systems.
 </dd>
 
 <dt><h4><pre><code>
@@ -180,6 +163,8 @@
 refer to the same type.
 <p>
 It may sometimes be referred to as a GUID - a <b>G</b>lobal <b>U</b>nique <b>ID</b>entifier.
+</dd>
+
 <dt><h4><pre><code>
 const char *get_key() const;
 </code></pre></h4></dt>
@@ -189,58 +174,93 @@
 </dd>
 
 <dt><h4><pre><code>
-bool operator&lt;(const extended_type_info &rhs) const;
-bool operator==(const extended_type_info &rhs) const;
-bool operator!=(const extended_type_info &rhs) const;
+bool operator<(const extended_type_info & rhs) const;
+bool operator==(const extended_type_info & rhs) const;
+bool operator!=(const extended_type_info & rhs) const;
 </code></pre></h4></dt>
 <dd>
-These functions are used to compare two <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code> objects.
-Among other things, these are used for lookup in the tables.
+These functions are used to compare two 
+<a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">
+<code style="white-space: normal">
+extended_type_info
+</code> 
+</a>
+objects. They a strict total ordering on all instances of this class.
+</dd>
 
 <dt><h4><pre><code>
-static const extended_type_info * find(const char *key);
+virtual void * construct(unsigned int count = 0, ...) const;
 </code></pre></h4></dt>
 <dd>
-Given a character string key or <strong>GUID</strong>, return the address of the 
-unique corresponding <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>
-object. 
+Construct a new instance of the type to which this
+<a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">
+<code style="white-space: normal">
+extended_type_info
+</code>
+</a>
+record corresponds. This function takes variable list of up to 4 arguments
+of any type.  These arguments are passed to the type's constructor
+at runtime.  In order to use the facility, 
+one must declare a type sequence for the constructor arguments.  
+Arguments for this function must match in number and type
+with those specified when the type was exported.  
+This function permits one to create instances of
+any exported type given only the exported <strong>GUID</strong> assigned
+with BOOST_CLASS_EXPORT.  
+If these types are defined in DLLS or shared libraries.  When these modules
+are loaded at runtime, these constructor can be called until the module
+is unloaded.  These modules are referred to as <b>plugin</b>. 
+</code>
+</dd>
 
 <dt><h4><pre><code>
-static const extended_type_info * find(const extended_type_info * t);
+virtual void destroy(void const * const p) const;
 </code></pre></h4></dt>
 <dd>
-Given a pointer to an
-<code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>,
-return the address of the instance of the same type in the main table.
-That is the argument t is used as a search argment to find the main
-table entry for a given type. It would be used like this:
-<code><pre>
-// return the global type entry for our type T
-return find(some_extended_type_info_implementation&lt;T&gt;())
-</pre></code>
+Destroy an instance created by the above constructor.
+</dd>
+
+<dt><h4><pre><code>
+static const extended_type_info * find(const char *key);
+</code></pre></h4></dt>
+<dd>
+Given a character string key or <strong>GUID</strong>, return the address of a 
+corresponding <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>
+object. 
 
 </dl>
 
 <h3><a name="requirements">Requirements</a></h3>
 In order to be used by the serialization library, an implementation of
 <code style="white-space: normal">extended_type_info</code>, 
-(referred to as ETI here), must implement the following:
+(referred to as ETI here), must be derived from 
+<a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">
+<code style="white-space: normal">
+extended_type_info
+</code> 
+</a>
+and also implement the following:
 
 <dl>
 
 <dt><h4><code style="white-space: normal"><pre>
 template&lt;class ETI&gt;
-virtual bool
-ETI::less_than(const extended_type_info &rhs) const;
+static extended_type_info &
+ETI::get_mutable_instance();
+static const extended_type_info &
+ETI::get_const:instance();
 </pre></code></h4></dt>
 <dd>
-Impose a strict total ordering on all instances of the class ETI.
+Return a pointer to the instance of
+<code style="white-space: normal">extended_type_info</code>
+which corresponds to type T.  Normally these instances are static objects so
+this just amounts to returning the address of this static object.
 </dd>
 
 <dt><h4><code style="white-space: normal"><pre>
 template&lt;class ETI&gt;
-static const extended_type_info *
-ETI::get_derived_extended_type_info(const T & t);
+const extended_type_info *
+ETI::get_derived_extended_type_info(const T & t) const;
 </pre></code></h4></dt>
 <dd>
 Return a pointer to the 
@@ -250,45 +270,16 @@
 hierarchy of classes.  The type T can always be cast to the "true type" with
 a static cast.  Implemention of this function will vary among type id systems
 and sometimes will make presumptions about the type T than can be identified
-with a particular <code style="white-space: normal">extended_type_info implementation</code>.
+with a particular <code style="white-space: normal">extended_type_info</code> implementation.
 </dd>
 
 <dt><h4><code style="white-space: normal"><pre>
-template&lt;class ETI&gt;
-static extended_type_info *
-ETI::get_instance();
+bool ETI::less_than(const extended_type_info &rhs) const;
 </pre></code></h4></dt>
 <dd>
-Return a pointer to the instance of
-<code style="white-space: normal">extended_type_info</code>
-which corresponds to type T.  Normally these instances are static objects so
-this just amounts to returning the address of this static object.
+Compare this instance to another one using the same
+<code style="white-space: normal">extended_type_info</code> implementation.
 </dd>
-
-<dt><h4><code style="white-space: normal"><pre>
-static void
-template&lt;class ETI&gt;
-ETI::export_register(const char * key);
-</pre></code></h4></dt>
-<dd>
-The main function is to invoke key_register to add the GUID to the
-global table.  Depending on the type id system being used, it might
-perform other initializaition functions as well.
-</dd>
-</dl>
-
-It must define the following 
-<a href="../../mpl/doc/refmanual/integral-constant.html">
-Itegral Constant</a>
-of type 
-bool:
-<dl>
-<dt><h4><code style="white-space: normal"><pre>
-ETI::is_polymorphic
-</pre></code></h4></dt>
-<dd>
-</dd>
-
 </dl>
 
 <h3><a name="models">Models</a></h3>
@@ -302,9 +293,11 @@
 <p>
 <code style="white-space: normal"><h4><a target="extended_type_info_no_rtti.hpp" href="../../../boost/serialization/extended_type_info_no_rtti.hpp">
 extended_type_info_no_rtti</a></h4></code>
-is implemented in a way that doesn't rely on the existence RTTI. 
-However, it does require that all classes for which type id is to be used implement
-a virtual function of the signiture:
+is implemented in a way that doesn't rely on the existence RTTI.
+However, if the export facility is to be used to serialize types
+through base class pointers, those types are required to implement
+a virtual function with the signature:
+
 <code><pre>
 virtual const char * get_key();
 </pre></code>
@@ -316,7 +309,9 @@
 The test program <code style="white-space: normal"><a target="test_no_rtti" href="../test/test_no_rtti.cpp">test_no_rtti</a></code>
 implements this function in terms of the <code style="white-space: normal"><a target="extended_type_info_no_rtti.hpp" href="../../../boost/serialization/extended_type_info_no_rtti.hpp">
 extended_type_info</a></code> API above to return the export key associated with the class.  
-This requires that non-abstract types be exported.
+This requires that non-abstract types be exported. It also demostrates the
+inter-operability with between two different implementations of
+<code style="white-space: normal">extended_type_info</code>.
 
 <hr>
 <p><i>&copy; Copyright Robert Ramey 2005. 

Modified: branches/release/libs/serialization/doc/headers.html
==============================================================================
--- branches/release/libs/serialization/doc/headers.html	(original)
+++ branches/release/libs/serialization/doc/headers.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -328,7 +328,7 @@
 boost/archive/detail/common_oarchive.hpp
 </a>
 <dd>
-All archive implmentations are derived from these header files.  They provide
+All archive implementations are derived from these header files.  They provide
 the interface to the internal implementation details of the library.
 </dd>
 

Modified: branches/release/libs/serialization/doc/implementation.html
==============================================================================
--- branches/release/libs/serialization/doc/implementation.html	(original)
+++ branches/release/libs/serialization/doc/implementation.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -207,10 +207,10 @@
     is added with STLPort, all tests complete successfully.
     <li>This compiler generates long warning messages related to the usage of
     non virtual destructors in polymorphic classes.  These warnings have been
-    carfully considered and the code that generates these warning has been 
+    carefully considered and the code that generates these warning has been 
     unchanged.  In this case the warning should should be ignored as in certain
     usages of the library, making the destructors virtual could lead to problems.
-    As an alternative, base class destructors have been make "protected" to
+    As an alternative, base class destructors have been made "protected" to
     address the concerns that motivate these warning messages.  When building
     the serialization library and tests with bjam, these warnings are suppressed. 
     When building one's own applications, these warnings can be suppressed by
@@ -223,7 +223,8 @@
 <h4><a name="gcc295">GCC 2.95</a></h4>
 All of the above plus:<br>
 <ul>
-    <li>The serialization library depends on the templeted stream implemention
+    <li>The serialization library depends on the templated stream 
+    implementation to function properly.
     to function properly.  So STLPort must be used to build the library.
     <li>Polymorphic archive tests fail.
     <li>XML serialization only works with version 1.6x of spirit. In order to build 
@@ -245,7 +246,7 @@
 
 <h4><a name="vc71">Visual C++ 7.1</a></h4>
 Derivation from an archive class defined in a DLL as described in ... will not work.
-This is due to the way that VC++ handles templeted code with __decl(dllexport) and
+This is due to the way that VC++ handles templated code with __decl(dllexport) and
 __decl(dllimport) specifications.  Basically, this compiler requires that all the
 instantiations have the same specification - even though they have different
 template arguments. The example <code style="white-space: normal">
@@ -255,15 +256,14 @@
 This compiler does not have RTTI or exception handling turned on by default.  Although
 they are not strictly necessary to use the serialization package, the example and test
 program presume that they are enabled.  So be sure your command line or IDE settings 
-enable these features if you want
-these switches are enabled if you want to build and run these programs.
+enable these features if you want to build and run these programs.
 <p>
 This compiler can treat <code style="white-space: normal">wchar_t</code> as either
 a short integer or an intrinsic type.
 If <code style="white-space: normal">/Zc:wchar_t</code> is specified on the
 compile command line, <code style="white-space: normal">wchar_t</code> will be 
 considered an intrinsic type - otherwise
-it will be treated as a synonym for a 16 bit integer.  The libary can be used
+it will be treated as a synonym for a 16 bit integer.  The library can be used
 either way - <strong>BUT</strong> - both the libray <strong>AND</strong> the application 
 must be  compiled with the same switch settings.  Note that <code style="white-space: normal">BJAM</code>
 includes this switch by default.  So if want to use the libraries that
@@ -356,11 +356,11 @@
         without a base class.)
     </ul>
     Working around this in the implementation of the library for this compiler
-    entailed a ridiculous amount of effort.  Even so, the effort wasn't entirely succesful.
+    entailed a ridiculous amount of effort.  Even so, the effort wasn't entirely successful.
     With this compiler, this message will still appear under the following conditions:
     <ul>
         <li>When serializing a class with multiple base classes.  This problem causes two 
-        failure in the test suite.  I have been unable to divise a way to work around this.
+        failure in the test suite.  I have been unable to devise a way to work around this.
         <li>Using more than one kind of archive in the same code module. This should be easy 
         to work around in practice.
     </ul>
@@ -372,11 +372,11 @@
 <ul>
     <li><code style="white-space: normal">enum</code> data members cannot be serialized.
     Conversion to/from integers will work around the problem.
-    <li>If class serialize functions are not accessable either by making them public or by
+    <li>If class serialize functions are not accessible either by making them public or by
     including <code style="white-space: normal">friend</code> declarations as described in 
     <a href="serialization.html#member">Class Serialization - Member Function</a>, the
     will compile but fail at runtime.
-    <li>Tests using custom extended type which doesn't use rtti fails. (5.64 only !).
+    <li>Tests using custom extended type which doesn't use RTTI fails. (5.64 only !).
     <li>Tests built in release mode fail. This seems to be an issue with the boost test system
     with this compiler.
     <li>XML serialization only works with version 1.6x of spirit. In order to build 
@@ -428,7 +428,7 @@
     <li>when built to use dynamic linking versions of C++ runtime code (<runtime-link>dynamic)
     all tests fail to link.  This is due to a missing symbol in the stlport library related
     to custom codecvt facets.
-    <li>the test_set fails to run correctly. It seems the hashed set interator doesn't
+    <li>the test_set fails to run correctly. It seems the hashed set iterator doesn't
     implement the ++ operator correctly.  This causes the test to fail by consuming all available
     memory.  Given this, this test is commented out.
 </ul>

Added: branches/release/libs/serialization/doc/new_case_studies.html
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/doc/new_case_studies.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+(C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . 
+Use, modification and distribution is subject to the Boost Software
+License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+-->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../../../boost.css">
+<link rel="stylesheet" type="text/css" href="style.css">
+<title>Serialization - Proposed Case Studies</title>
+</head>
+<body link="#0000ff" vlink="#800080">
+<table border="0" cellpadding="7" cellspacing="0" width="100%" summary="header">
+  <tr> 
+    <td valign="top" width="300"> 
+      <h3>
</h3>
+    </td>
+    <td valign="top"> 
+      <h1 align="center">Serialization</h1>
+      <h2 align="center">Proposed Case Studies</h2>
+    </td>
+  </tr>
+</table>
+<hr>
+<dl class="index">
+  <dt>Serializing a Function Object</dt>
+  <dt>Archive Adaptors</dt>
+  <dt>Archive Helpers</dt>
+</dl>
+
+These are not part of the library itself, but rather
+techiques on how to use the library to address specific situations.
+
+<h2><a name="functionobject"></a>Serializing a Function Object</h2>
+An example on how to serialize a function object.  I believe this
+could be done by serializing pointer to the object in question.  Since
+the Serialization library resurrects pointer of the correct type
+this should be easily implementable.
+<p>
+If a group of function objects were all derived from the
+same polymorphic base class - perhaps via multiple inheritance,
+the the function object effectively becomes a "variable" which
+encapsulates code.
+<p>
+This case study would show how to do this.
+
+<h2><a name="archiveadaptor"></a>Archive Adaptors</h2>
+
+Often users want to add their own special functionality to an
+existing archive.  Examples of this are performance enhancements
+for specific types, Adjustment of output syntax for xml archives,
+and logging/debug output as archives are written and/or read.
+If this functionalty is implemented as an "adaptor" template
+which takes the base class as a template argument, such functionality
+appended to any archive for which that funtionality makes sense.
+For example, an adaptor for generating an xml schema could be
+appended to both wide narrow character versions of xml archives.
+<p>
+This case study would show how to make a useful archive adaptor.
+
+<h2><a name="archivehelper"></a>Archive Helpers</h2>
+Some types are not serializable as they stand.  That is - they
+do not fullfill the requirements of the "Serializable Concept".
+The iconic example of this is boost::shared_ptr.  Sometimes
+these types could be made serializable by adding code inside
+the library.  Of course, doing that would create a lifetime
+of unpaid employment for the library author. Rather than
+adding a bunch of special code to the library itself, this
+code can packaged as a "helper" or "mix-in" class.  Then
+a new archive is derived from both the "base" archive class
+AND the "helper" class.  This is how boost::shared_ptr
+has been implemented.
+<p>
+It would also be possible to make a "generic runtime helper"
+which would effectively extend the API of the library.  Previously
+the library included such a helper class.  It was removed
+in favor of the current implementation.  But this functionality
+should be added back in with another adaptor which would
+become part of the library.
+
+<hr>
+<p>Revised 1 November, 2008 
+<p><i>&copy; Copyright Robert Ramey 2002-2008. 
+Distributed under the Boost Software License, Version 1.0. (See
+accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+</i></p>
+</body>
+</html>

Added: branches/release/libs/serialization/doc/performance_status.html
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/doc/performance_status.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,30 @@
+<html>
+<head>
+<title>Boost Library Status Automatic Test</title>
+</head>
+<body bgcolor="#ffffff" text="#000000">
+<table border="0">
+<tr>
+<td><img border="0" src="C:/BoostTrunk/boost.png" width="277" height="86"></td>
+<td>
+<h1>Library Status: serialization</h1>
+<b>Run Date:</b> 02:42:48 UTC, Tuesday 10 June 2008
+</td>
+</table>
+<br>
+<table border="1" cellspacing="0" cellpadding="5">
+<tr>
+<td rowspan="2">Test Name</td>
+<td align="center" >gcc-3.4.4</td>
+</tr><tr>
+<td align="center" >profile</td>
+</tr><tr><td>peformance_array_binary_archive</a></td><td align="right">Pass Profile</td></tr>
+<tr><td>peformance_array_text_archive</a></td><td align="right">Pass Profile</td></tr>
+<tr><td>peformance_array_text_warchive</a></td><td align="right"><i>Missing</i></td></tr>
+<tr><td>peformance_array_xml_archive</a></td><td align="right">Pass Profile</td></tr>
+<tr><td>peformance_array_xml_warchive</a></td><td align="right"><i>Missing</i></td></tr>
+<tr><td>performance_iterators</a></td><td align="right">Pass Profile</td></tr>
+<tr><td>performance_iterators_base64</a></td><td align="right">Pass Profile</td></tr>
+</table>
+</body>
+</html>

Added: branches/release/libs/serialization/doc/profile1.txt
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/doc/profile1.txt	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,149 @@
+Flat profile:
+
+Each sample counts as 0.01 seconds.
+ no time accumulated
+
+  %   cumulative   self              self     total           
+ time   seconds   seconds    calls  Ts/call  Ts/call  name    
+  0.00      0.00     0.00      200     0.00     0.00  void accumulate<unsigned long>(unsigned int&, unsigned long const&)
+  0.00      0.00     0.00      150     0.00     0.00  _pei386_runtime_relocator
+  0.00      0.00     0.00        1     0.00     0.00  std::ostream::operator<<(void const*)
+  0.00      0.00     0.00        1     0.00     0.00  __divdi3
+
+ %         the percentage of the total running time of the
+time       program used by this function.
+
+cumulative a running sum of the number of seconds accounted
+ seconds   for by this function and those listed above it.
+
+ self      the number of seconds accounted for by this
+seconds    function alone.  This is the major sort for this
+           listing.
+
+calls      the number of times this function was invoked, if
+           this function is profiled, else blank.
+ 
+ self      the average number of milliseconds spent in this
+ms/call    function per call, if this function is profiled,
+	   else blank.
+
+ total     the average number of milliseconds spent in this
+ms/call    function and its descendents per call, if this 
+	   function is profiled, else blank.
+
+name       the name of the function.  This is the minor sort
+           for this listing. The index shows the location of
+	   the function in the gprof listing. If the index is
+	   in parenthesis it shows where it would appear in
+	   the gprof listing if it were to be printed.
+
+		     Call graph (explanation follows)
+
+
+granularity: each sample hit covers 4 byte(s) no time propagated
+
+index % time    self  children    called     name
+                0.00    0.00     200/200         setvbuf [1286]
+[4]      0.0    0.00    0.00     200         void accumulate<unsigned long>(unsigned int&, unsigned long const&) [4]
+-----------------------------------------------
+                0.00    0.00     150/150         _cygwin_crt0_common_at_8 [1230]
+[5]      0.0    0.00    0.00     150         _pei386_runtime_relocator [5]
+-----------------------------------------------
+                0.00    0.00       1/1           _lseek64 [1234]
+[6]      0.0    0.00    0.00       1         std::ostream::operator<<(void const*) [6]
+-----------------------------------------------
+                0.00    0.00       1/1           __tcf_1 [1221]
+[7]      0.0    0.00    0.00       1         __divdi3 [7]
+-----------------------------------------------
+                                   2             main [1263]
+[1263]   0.0    0.00    0.00       0+2       main [1263]
+                                   2             main [1263]
+-----------------------------------------------
+
+ This table describes the call tree of the program, and was sorted by
+ the total amount of time spent in each function and its children.
+
+ Each entry in this table consists of several lines.  The line with the
+ index number at the left hand margin lists the current function.
+ The lines above it list the functions that called this function,
+ and the lines below it list the functions this one called.
+ This line lists:
+     index	A unique number given to each element of the table.
+		Index numbers are sorted numerically.
+		The index number is printed next to every function name so
+		it is easier to look up where the function in the table.
+
+     % time	This is the percentage of the `total' time that was spent
+		in this function and its children.  Note that due to
+		different viewpoints, functions excluded by options, etc,
+		these numbers will NOT add up to 100%.
+
+     self	This is the total amount of time spent in this function.
+
+     children	This is the total amount of time propagated into this
+		function by its children.
+
+     called	This is the number of times the function was called.
+		If the function called itself recursively, the number
+		only includes non-recursive calls, and is followed by
+		a `+' and the number of recursive calls.
+
+     name	The name of the current function.  The index number is
+		printed after it.  If the function is a member of a
+		cycle, the cycle number is printed between the
+		function's name and the index number.
+
+
+ For the function's parents, the fields have the following meanings:
+
+     self	This is the amount of time that was propagated directly
+		from the function into this parent.
+
+     children	This is the amount of time that was propagated from
+		the function's children into this parent.
+
+     called	This is the number of times this parent called the
+		function `/' the total number of times the function
+		was called.  Recursive calls to the function are not
+		included in the number after the `/'.
+
+     name	This is the name of the parent.  The parent's index
+		number is printed after it.  If the parent is a
+		member of a cycle, the cycle number is printed between
+		the name and the index number.
+
+ If the parents of the function cannot be determined, the word
+ `<spontaneous>' is printed in the `name' field, and all the other
+ fields are blank.
+
+ For the function's children, the fields have the following meanings:
+
+     self	This is the amount of time that was propagated directly
+		from the child into the function.
+
+     children	This is the amount of time that was propagated from the
+		child's children to the function.
+
+     called	This is the number of times the function called
+		this child `/' the total number of times the child
+		was called.  Recursive calls by the child are not
+		listed in the number after the `/'.
+
+     name	This is the name of the child.  The child's index
+		number is printed after it.  If the child is a
+		member of a cycle, the cycle number is printed
+		between the name and the index number.
+
+ If there are any cycles (circles) in the call graph, there is an
+ entry for the cycle-as-a-whole.  This entry shows who called the
+ cycle (as parents) and the members of the cycle (as children.)
+ The `+' recursive calls entry shows the number of function calls that
+ were internal to the cycle, and the calls entry for each member shows,
+ for that member, how many times it was called from other members of
+ the cycle.
+
+
+Index by function name
+
+   [4] void accumulate<unsigned long>(unsigned int&, unsigned long const&) [7] __divdi3
+   [6] std::ostream::operator<<(void const*) [5] _pei386_runtime_relocator

Added: branches/release/libs/serialization/doc/profile2.txt
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/doc/profile2.txt	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,203 @@
+Flat profile:
+
+Each sample counts as 0.01 seconds.
+  %   cumulative   self              self     total           
+ time   seconds   seconds    calls  Ts/call  Ts/call  name    
+100.00      0.01     0.01                             __gnu_cxx::__atomic_add(int volatile*, int)
+  0.00      0.01     0.00       51     0.00     0.00  boost::archive::iterators::transform_width<char*, 6, 8, char>::fill()
+  0.00      0.01     0.00       36     0.00     0.00  boost::archive::iterators::transform_width<__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, 8, 6, char>::fill()
+  0.00      0.01     0.00       30     0.00     0.00  std::vector<char, std::allocator<char> >::_M_insert_aux(__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, char const&)
+  0.00      0.01     0.00       11     0.00     0.00  boost::archive::iterators::xml_escape<char const*>::fill(char const*&, char const*&)
+  0.00      0.01     0.00        9     0.00     0.00  void test_transform_width<6, 8>(unsigned int)
+  0.00      0.01     0.00        9     0.00     0.00  boost::archive::iterators::xml_unescape<char const*>::drain()
+  0.00      0.01     0.00        5     0.00     0.00  boost::archive::iterators::xml_unescape<char const*>::drain_residue(char const*)
+  0.00      0.01     0.00        2     0.00     0.00  __static_initialization_and_destruction_0(int, int)
+  0.00      0.01     0.00        1     0.00     0.00  void test_xml_escape<char const>(char const*, char const*, unsigned int)
+  0.00      0.01     0.00        1     0.00     0.00  void test_xml_unescape<char const>(char const*, char const*, unsigned int)
+  0.00      0.01     0.00        1     0.00     0.00  void test_stream_iterators<char>(char const*, unsigned int)
+  0.00      0.01     0.00        1     0.00     0.00  test_main(int, char**)
+  0.00      0.01     0.00        1     0.00     0.00  char* std::string::_S_construct<char*>(char*, char*, std::allocator<char> const&, std::forward_iterator_tag)
+  0.00      0.01     0.00        1     0.00     0.00  std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string<char*>(char*, char*, std::allocator<char> const&)
+
+ %         the percentage of the total running time of the
+time       program used by this function.
+
+cumulative a running sum of the number of seconds accounted
+ seconds   for by this function and those listed above it.
+
+ self      the number of seconds accounted for by this
+seconds    function alone.  This is the major sort for this
+           listing.
+
+calls      the number of times this function was invoked, if
+           this function is profiled, else blank.
+ 
+ self      the average number of milliseconds spent in this
+ms/call    function per call, if this function is profiled,
+	   else blank.
+
+ total     the average number of milliseconds spent in this
+ms/call    function and its descendents per call, if this 
+	   function is profiled, else blank.
+
+name       the name of the function.  This is the minor sort
+           for this listing. The index shows the location of
+	   the function in the gprof listing. If the index is
+	   in parenthesis it shows where it would appear in
+	   the gprof listing if it were to be printed.
+
+		     Call graph (explanation follows)
+
+
+granularity: each sample hit covers 4 byte(s) for 100.00% of 0.01 seconds
+
+index % time    self  children    called     name
+                                                 <spontaneous>
+[1]    100.0    0.01    0.00                 __gnu_cxx::__atomic_add(int volatile*, int) [1]
+-----------------------------------------------
+                0.00    0.00      51/51          void test_transform_width<6, 8>(unsigned int) [9]
+[5]      0.0    0.00    0.00      51         boost::archive::iterators::transform_width<char*, 6, 8, char>::fill() [5]
+-----------------------------------------------
+                0.00    0.00      36/36          void test_transform_width<6, 8>(unsigned int) [9]
+[6]      0.0    0.00    0.00      36         boost::archive::iterators::transform_width<__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, 8, 6, char>::fill() [6]
+-----------------------------------------------
+                0.00    0.00      30/30          void test_transform_width<6, 8>(unsigned int) [9]
+[7]      0.0    0.00    0.00      30         std::vector<char, std::allocator<char> >::_M_insert_aux(__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, char const&) [7]
+-----------------------------------------------
+                0.00    0.00      11/11          void test_xml_escape<char const>(char const*, char const*, unsigned int) [13]
+[8]      0.0    0.00    0.00      11         boost::archive::iterators::xml_escape<char const*>::fill(char const*&, char const*&) [8]
+-----------------------------------------------
+                0.00    0.00       9/9           test_main(int, char**) [16]
+[9]      0.0    0.00    0.00       9         void test_transform_width<6, 8>(unsigned int) [9]
+                0.00    0.00      51/51          boost::archive::iterators::transform_width<char*, 6, 8, char>::fill() [5]
+                0.00    0.00      36/36          boost::archive::iterators::transform_width<__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, 8, 6, char>::fill() [6]
+                0.00    0.00      30/30          std::vector<char, std::allocator<char> >::_M_insert_aux(__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, char const&) [7]
+-----------------------------------------------
+                0.00    0.00       9/9           void test_xml_unescape<char const>(char const*, char const*, unsigned int) [14]
+[10]     0.0    0.00    0.00       9         boost::archive::iterators::xml_unescape<char const*>::drain() [10]
+                0.00    0.00       5/5           boost::archive::iterators::xml_unescape<char const*>::drain_residue(char const*) [11]
+-----------------------------------------------
+                0.00    0.00       5/5           boost::archive::iterators::xml_unescape<char const*>::drain() [10]
+[11]     0.0    0.00    0.00       5         boost::archive::iterators::xml_unescape<char const*>::drain_residue(char const*) [11]
+-----------------------------------------------
+                0.00    0.00       1/2           global constructors keyed to main [38]
+                0.00    0.00       1/2           global destructors keyed to main [35]
+[12]     0.0    0.00    0.00       2         __static_initialization_and_destruction_0(int, int) [12]
+-----------------------------------------------
+                0.00    0.00       1/1           test_main(int, char**) [16]
+[13]     0.0    0.00    0.00       1         void test_xml_escape<char const>(char const*, char const*, unsigned int) [13]
+                0.00    0.00      11/11          boost::archive::iterators::xml_escape<char const*>::fill(char const*&, char const*&) [8]
+-----------------------------------------------
+                0.00    0.00       1/1           test_main(int, char**) [16]
+[14]     0.0    0.00    0.00       1         void test_xml_unescape<char const>(char const*, char const*, unsigned int) [14]
+                0.00    0.00       9/9           boost::archive::iterators::xml_unescape<char const*>::drain() [10]
+-----------------------------------------------
+                0.00    0.00       1/1           test_main(int, char**) [16]
+[15]     0.0    0.00    0.00       1         void test_stream_iterators<char>(char const*, unsigned int) [15]
+                0.00    0.00       1/1           std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string<char*>(char*, char*, std::allocator<char> const&) [18]
+-----------------------------------------------
+                0.00    0.00       1/1           main [1211]
+[16]     0.0    0.00    0.00       1         test_main(int, char**) [16]
+                0.00    0.00       9/9           void test_transform_width<6, 8>(unsigned int) [9]
+                0.00    0.00       1/1           void test_xml_escape<char const>(char const*, char const*, unsigned int) [13]
+                0.00    0.00       1/1           void test_xml_unescape<char const>(char const*, char const*, unsigned int) [14]
+                0.00    0.00       1/1           void test_stream_iterators<char>(char const*, unsigned int) [15]
+-----------------------------------------------
+                0.00    0.00       1/1           std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string<char*>(char*, char*, std::allocator<char> const&) [18]
+[17]     0.0    0.00    0.00       1         char* std::string::_S_construct<char*>(char*, char*, std::allocator<char> const&, std::forward_iterator_tag) [17]
+-----------------------------------------------
+                0.00    0.00       1/1           void test_stream_iterators<char>(char const*, unsigned int) [15]
+[18]     0.0    0.00    0.00       1         std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string<char*>(char*, char*, std::allocator<char> const&) [18]
+                0.00    0.00       1/1           char* std::string::_S_construct<char*>(char*, char*, std::allocator<char> const&, std::forward_iterator_tag) [17]
+-----------------------------------------------
+
+ This table describes the call tree of the program, and was sorted by
+ the total amount of time spent in each function and its children.
+
+ Each entry in this table consists of several lines.  The line with the
+ index number at the left hand margin lists the current function.
+ The lines above it list the functions that called this function,
+ and the lines below it list the functions this one called.
+ This line lists:
+     index	A unique number given to each element of the table.
+		Index numbers are sorted numerically.
+		The index number is printed next to every function name so
+		it is easier to look up where the function in the table.
+
+     % time	This is the percentage of the `total' time that was spent
+		in this function and its children.  Note that due to
+		different viewpoints, functions excluded by options, etc,
+		these numbers will NOT add up to 100%.
+
+     self	This is the total amount of time spent in this function.
+
+     children	This is the total amount of time propagated into this
+		function by its children.
+
+     called	This is the number of times the function was called.
+		If the function called itself recursively, the number
+		only includes non-recursive calls, and is followed by
+		a `+' and the number of recursive calls.
+
+     name	The name of the current function.  The index number is
+		printed after it.  If the function is a member of a
+		cycle, the cycle number is printed between the
+		function's name and the index number.
+
+
+ For the function's parents, the fields have the following meanings:
+
+     self	This is the amount of time that was propagated directly
+		from the function into this parent.
+
+     children	This is the amount of time that was propagated from
+		the function's children into this parent.
+
+     called	This is the number of times this parent called the
+		function `/' the total number of times the function
+		was called.  Recursive calls to the function are not
+		included in the number after the `/'.
+
+     name	This is the name of the parent.  The parent's index
+		number is printed after it.  If the parent is a
+		member of a cycle, the cycle number is printed between
+		the name and the index number.
+
+ If the parents of the function cannot be determined, the word
+ `<spontaneous>' is printed in the `name' field, and all the other
+ fields are blank.
+
+ For the function's children, the fields have the following meanings:
+
+     self	This is the amount of time that was propagated directly
+		from the child into the function.
+
+     children	This is the amount of time that was propagated from the
+		child's children to the function.
+
+     called	This is the number of times the function called
+		this child `/' the total number of times the child
+		was called.  Recursive calls by the child are not
+		listed in the number after the `/'.
+
+     name	This is the name of the child.  The child's index
+		number is printed after it.  If the child is a
+		member of a cycle, the cycle number is printed
+		between the name and the index number.
+
+ If there are any cycles (circles) in the call graph, there is an
+ entry for the cycle-as-a-whole.  This entry shows who called the
+ cycle (as parents) and the members of the cycle (as children.)
+ The `+' recursive calls entry shows the number of function calls that
+ were internal to the cycle, and the calls entry for each member shows,
+ for that member, how many times it was called from other members of
+ the cycle.
+
+
+Index by function name
+
+  [13] void test_xml_escape<char const>(char const*, char const*, unsigned int) [16] test_main(int, char**) [5] boost::archive::iterators::transform_width<char*, 6, 8, char>::fill()
+  [14] void test_xml_unescape<char const>(char const*, char const*, unsigned int) [8] boost::archive::iterators::xml_escape<char const*>::fill(char const*&, char const*&) [1] __gnu_cxx::__atomic_add(int volatile*, int)
+   [9] void test_transform_width<6, 8>(unsigned int) [11] boost::archive::iterators::xml_unescape<char const*>::drain_residue(char const*) [17] char* std::string::_S_construct<char*>(char*, char*, std::allocator<char> const&, std::forward_iterator_tag)
+  [15] void test_stream_iterators<char>(char const*, unsigned int) [10] boost::archive::iterators::xml_unescape<char const*>::drain() [18] std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string<char*>(char*, char*, std::allocator<char> const&)
+  [12] __static_initialization_and_destruction_0(int, int) (performance_iterators.cpp) [6] boost::archive::iterators::transform_width<__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, 8, 6, char>::fill() [7] std::vector<char, std::allocator<char> >::_M_insert_aux(__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, char const&)

Added: branches/release/libs/serialization/doc/profile3.txt
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/doc/profile3.txt	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,153 @@
+Flat profile:
+
+Each sample counts as 0.01 seconds.
+ no time accumulated
+
+  %   cumulative   self              self     total           
+ time   seconds   seconds    calls  Ts/call  Ts/call  name    
+  0.00      0.00     0.00      200     0.00     0.00  boost::archive::iterators::transform_width<char*, 6, 8, char>::fill()
+  0.00      0.00     0.00      150     0.00     0.00  boost::archive::iterators::transform_width<boost::archive::iterators::binary_from_base64<boost::archive::iterators::remove_whitespace<std::_List_iterator<char> >, char>, 8, 6, char>::fill()
+  0.00      0.00     0.00        2     0.00     0.00  __static_initialization_and_destruction_0(int, int)
+  0.00      0.00     0.00        1     0.00     0.00  void test_base64<char>()
+  0.00      0.00     0.00        1     0.00     0.00  std::_List_base<char, std::allocator<char> >::_M_clear()
+
+ %         the percentage of the total running time of the
+time       program used by this function.
+
+cumulative a running sum of the number of seconds accounted
+ seconds   for by this function and those listed above it.
+
+ self      the number of seconds accounted for by this
+seconds    function alone.  This is the major sort for this
+           listing.
+
+calls      the number of times this function was invoked, if
+           this function is profiled, else blank.
+ 
+ self      the average number of milliseconds spent in this
+ms/call    function per call, if this function is profiled,
+	   else blank.
+
+ total     the average number of milliseconds spent in this
+ms/call    function and its descendents per call, if this 
+	   function is profiled, else blank.
+
+name       the name of the function.  This is the minor sort
+           for this listing. The index shows the location of
+	   the function in the gprof listing. If the index is
+	   in parenthesis it shows where it would appear in
+	   the gprof listing if it were to be printed.
+
+		     Call graph (explanation follows)
+
+
+granularity: each sample hit covers 4 byte(s) no time propagated
+
+index % time    self  children    called     name
+                0.00    0.00     200/200         void test_base64<char>() [7]
+[4]      0.0    0.00    0.00     200         boost::archive::iterators::transform_width<char*, 6, 8, char>::fill() [4]
+-----------------------------------------------
+                0.00    0.00     150/150         void test_base64<char>() [7]
+[5]      0.0    0.00    0.00     150         boost::archive::iterators::transform_width<boost::archive::iterators::binary_from_base64<boost::archive::iterators::remove_whitespace<std::_List_iterator<char> >, char>, 8, 6, char>::fill() [5]
+-----------------------------------------------
+                0.00    0.00       1/2           global constructors keyed to main [27]
+                0.00    0.00       1/2           global destructors keyed to main [24]
+[6]      0.0    0.00    0.00       2         __static_initialization_and_destruction_0(int, int) [6]
+-----------------------------------------------
+                0.00    0.00       1/1           main [1156]
+[7]      0.0    0.00    0.00       1         void test_base64<char>() [7]
+                0.00    0.00     200/200         boost::archive::iterators::transform_width<char*, 6, 8, char>::fill() [4]
+                0.00    0.00     150/150         boost::archive::iterators::transform_width<boost::archive::iterators::binary_from_base64<boost::archive::iterators::remove_whitespace<std::_List_iterator<char> >, char>, 8, 6, char>::fill() [5]
+                0.00    0.00       1/1           std::_List_base<char, std::allocator<char> >::_M_clear() [8]
+-----------------------------------------------
+                0.00    0.00       1/1           void test_base64<char>() [7]
+[8]      0.0    0.00    0.00       1         std::_List_base<char, std::allocator<char> >::_M_clear() [8]
+-----------------------------------------------
+
+ This table describes the call tree of the program, and was sorted by
+ the total amount of time spent in each function and its children.
+
+ Each entry in this table consists of several lines.  The line with the
+ index number at the left hand margin lists the current function.
+ The lines above it list the functions that called this function,
+ and the lines below it list the functions this one called.
+ This line lists:
+     index	A unique number given to each element of the table.
+		Index numbers are sorted numerically.
+		The index number is printed next to every function name so
+		it is easier to look up where the function in the table.
+
+     % time	This is the percentage of the `total' time that was spent
+		in this function and its children.  Note that due to
+		different viewpoints, functions excluded by options, etc,
+		these numbers will NOT add up to 100%.
+
+     self	This is the total amount of time spent in this function.
+
+     children	This is the total amount of time propagated into this
+		function by its children.
+
+     called	This is the number of times the function was called.
+		If the function called itself recursively, the number
+		only includes non-recursive calls, and is followed by
+		a `+' and the number of recursive calls.
+
+     name	The name of the current function.  The index number is
+		printed after it.  If the function is a member of a
+		cycle, the cycle number is printed between the
+		function's name and the index number.
+
+
+ For the function's parents, the fields have the following meanings:
+
+     self	This is the amount of time that was propagated directly
+		from the function into this parent.
+
+     children	This is the amount of time that was propagated from
+		the function's children into this parent.
+
+     called	This is the number of times this parent called the
+		function `/' the total number of times the function
+		was called.  Recursive calls to the function are not
+		included in the number after the `/'.
+
+     name	This is the name of the parent.  The parent's index
+		number is printed after it.  If the parent is a
+		member of a cycle, the cycle number is printed between
+		the name and the index number.
+
+ If the parents of the function cannot be determined, the word
+ `<spontaneous>' is printed in the `name' field, and all the other
+ fields are blank.
+
+ For the function's children, the fields have the following meanings:
+
+     self	This is the amount of time that was propagated directly
+		from the child into the function.
+
+     children	This is the amount of time that was propagated from the
+		child's children to the function.
+
+     called	This is the number of times the function called
+		this child `/' the total number of times the child
+		was called.  Recursive calls by the child are not
+		listed in the number after the `/'.
+
+     name	This is the name of the child.  The child's index
+		number is printed after it.  If the child is a
+		member of a cycle, the cycle number is printed
+		between the name and the index number.
+
+ If there are any cycles (circles) in the call graph, there is an
+ entry for the cycle-as-a-whole.  This entry shows who called the
+ cycle (as parents) and the members of the cycle (as children.)
+ The `+' recursive calls entry shows the number of function calls that
+ were internal to the cycle, and the calls entry for each member shows,
+ for that member, how many times it was called from other members of
+ the cycle.
+
+
+Index by function name
+
+   [7] void test_base64<char>() [5] boost::archive::iterators::transform_width<boost::archive::iterators::binary_from_base64<boost::archive::iterators::remove_whitespace<std::_List_iterator<char> >, char>, 8, 6, char>::fill() [8] std::_List_base<char, std::allocator<char> >::_M_clear()
+   [6] __static_initialization_and_destruction_0(int, int) (performance_iterators_base64.cpp) [4] boost::archive::iterators::transform_width<char*, 6, 8, char>::fill()

Modified: branches/release/libs/serialization/doc/rationale.html
==============================================================================
--- branches/release/libs/serialization/doc/rationale.html	(original)
+++ branches/release/libs/serialization/doc/rationale.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -228,7 +228,7 @@
   After a lot of investigation, it's discovered what the source of the problem
   and class construct_from is marked "track_never" by including:
 <code style="white-space: normal"><pre>
-BOOST_SERIALIZATION_TRACKING(construct_from, track_never) 
+BOOST_CLASS_TRACKING(construct_from, track_never) 
 </pre></code>
   <li>Now everything works again. Or - so it seems.
   <p>
@@ -298,7 +298,7 @@
       might not even be written yet). OK, I'll add the following to my 
       construct_from.hpp to solve the problem. 
 <code style="white-space: normal"><pre>
-BOOST_SERIALIZATION_TRACKING(construct_from, track_never) 
+BOOST_CLASS_TRACKING(construct_from, track_never) 
 </pre></code>
     </ol>
   </ul>
@@ -311,7 +311,7 @@
   <li>But now he gets another trap - trying to save an object of a 
   class marked "track_never" through a pointer. So he goes back to 
   construct_from.hpp and comments out the 
-  <code style="white-space: normal">BOOST_SERIALIZATION_TRACKING</code> that 
+  <code style="white-space: normal">BOOST_CLASS_TRACKING</code> that 
   was inserted. Now the second trap is avoided, But damn - the first trap is 
   popping up again. Eventually, after some code restructuring, the differing
   requirements of serializating <code style="white-space: normal">construct_from</code>

Modified: branches/release/libs/serialization/doc/release.html
==============================================================================
--- branches/release/libs/serialization/doc/release.html	(original)
+++ branches/release/libs/serialization/doc/release.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,4 +1,4 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!--
 (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . 
@@ -27,20 +27,22 @@
 <hr>
 <dl class="index">
   <dt>Requirements</dt>
-  <dt>Differences from version 1.32</dt>
-  <dt>Differences from version 1.33</dt>
+  <dt>Differences from version 1.35</dt>
   <dt>Differences from version 1.34</dt>
+  <dt>Differences from version 1.33</dt>
+  <dt>Differences from version 1.32</dt>
   <dt>Pending Issues</dt>
 </dl>
-This is the Boost 1.33 Serialization Library.
-There are currently no known bugs. However, due to compiler/library quirks and or 
+As of this is written, there are no known bugs. However, due to compiler/library quirks and or 
 bugs, some tests fail with some combinations of compilers and libraries.
 <h2><a name="requirements"></a>Requirements</h2>
-This library requires Boost version 1.33 or later.
+This library has been tested on Boost version 1.34 and 1.35.
+
+<!--
 <p>
 The serialization library uses the boost spirit package to load XML archives.
 We have found that all tests pass using spirit 1.6x. Spirit 1.8 and higher does not work with
-older compilers - specificallly MSVC 6, Borland and GCC < 3.0.
+older compilers - specifically MSVC 6, Borland and GCC < 3.0.
 If you are using one of these compilers, you may download a version
 of spirit 1.6 here.
 To use this downloaded version rather than the one included with boost,
@@ -52,11 +54,46 @@
 If you're not using bjam and the Jamfile to build the library, be sure that
 the directory which contains the version of spirit you plan to use is placed
 at the front of the list of include paths.
+-->
+
+<h2><a name="differences_1_35"></a>Differences from Boost 1.35</h2>
+<ul>
+    <li>The library is now thread safe.  That is, multiple archives can be open
+    in different threads.  This has been implmented with a lock-free algorithm
+    to avoid any performance bottlenecks.
+    <li>Serialization of types defined in shared libraries is now supported.
+    shared libraries (DLLS) can be loaded/unloaded dynamically at runtime.
+    This includes the serialization of instances of abstract base classes so that
+    a program can be written so as to be compatible with as yet undefined
+    and un-implemented code.
+    <li>The extended type info system has been enhanced to in order to implement
+    the above.  It is now a general purpose system for creating and casting of
+    types about which is only known a string ID and an abstract base class.
+    <li>All bug reports filed as TRAK tickets have been addressed.
+    <li>As of this writing, the library will fail build on older compilers such
+    as MSVC before version 7.1 and older versions of Borland compilers.  This
+    might or might not change in the future.
+</ul>
+
+<h2><a name="differences_1_34"></a>Differences from Boost 1.34</h2>
+<ul>
+    <li>Enhanced support for fast serialization for native binary archives. By Mattias Troyer.
+    <li>Improved implementation of "export" functionality.  Removes header ordering
+        requirement and eliminates the maintenance of a pre-determined list of "known archives"
+        By David Abrahams.
+    <li>Improved support for STLPort.
+</ul>
+
+<h2><a name="differences_1_33"></a>Differences from Boost 1.33</h2>
+<ul>
+    <li>Native Binary archives use the <code style="white-space: normal">std::streambuf</code> interface.
+    This should result in noticeably faster execution in many cases.
+</ul>
 
 <h2><a name="differences_1_32"></a>Differences from Boost 1.32</h2>
 <ul>
     <li>Dynamic Linking Library (DLLs and shared libraries) for platforms which support them. See
-    Automatic Linking on Windows.
+    Automatic Linking on Windows.
     <li>Implementation of auto-link for compilers which can support this.
     <li>Better support for <em>Argument Dependent Lookup</em> and two-phase lookup.
     This results in simpler rules regarding the placing of serialization specializations
@@ -66,7 +103,7 @@
     <li>Improved <code>const</code> correctness for save/load operators.  Note that this may
     produce compile time errors in code which compiled without problem in earlier boost releases.
     In most cases the fix is trivial.  In other cases, code should be scrutinized to be
-    sure that it doesn't use the serializaton system in a way which may introduce subtle bugs in
+    sure that it doesn't use the serialization system in a way which may introduce subtle bugs in
     to the program.  A fuller explanation of this issue can be found
     <a target="detail" href="traits.html#tracking">here</a>.
     <li>A new implementation of serialization for <code style="white-space: normal">shared_ptr&lt;T&gt;</code>.  This
@@ -78,42 +115,24 @@
     needs to load archives created with boost 1.32 libraries, include the above header
     before each inclusion of <code style="white-space: normal">boost/serialization/shared_ptr.hpp</code>.
     <li>More compilers tested and supported.
-    <li>Miscelleanous bug fixes.
-</ul>
-<h2><a name="differences_1_33"></a>Differences from Boost 1.33</h2>
-<ul>
-    <li>Native Binary archives use the <code style="white-space: normal">std::streambuf</code> interface.
-    This should result in noticibly faster execution in many cases.
-</ul>
-
-<h2><a name="differences_1_34"></a>Differences from Boost 1.34</h2>
-<ul>
-    <li>Ehanced support for fast serialiation for native binary archives. By Mattias Troyer.
-    <li>Improved implementation of "export" functionality.  Removes header ordering
-        requirement and eliminates the maintainence of a pre-determined list of "known archives"
-        By David Abrahams.
-    <li>Improved support for STLPort.
+    <li>Miscellaneous bug fixes.
 </ul>
 
 <h2><a name="todo"></a>Pending issues</h2>
 <ul>
-    <li>Compile, and test on more platforms
-    <li>implement <code>is_virtual_base&lt;T&gt;</code> to automatically
-    eliminate redundancy in virtual base class serialization.
     <li>currently can't serialize through a pointer an object a of class
     that implements its own <code style="white-space: normal">new/delete</code> operators.
     <li>Its possible that <code style="white-space: normal">std::string</code>
     and <code style="white-space: normal">std::wstring</code> contain characters such as
-    '\0' which cannot be rendered in XML without an escape mechanism.  Currently there is 
-    no such escape mechanism implemented.
-    <li>A subtle error in the implementation of serialiaton of <code style="white-space: normal">std::map</code>
+    '\0' and -1 (EOF) which cannot be rendered in text and XML archives without an escape mechanism.
+    Currently there is no such escape mechanism implemented.
+    <li>A subtle error in the implementation of serializaton of <code style="white-space: normal">std::map</code>
     is fixed in this version.  Unfortunately, the fix breaks serialization of
     <code style="white-space: normal">std::map</code> for those compilers which do not support
     partial template specialization.
-    <li>Floating point values which are number cannot be serialized to text base archives.
-</ul>
+ </ul>
 <p>
-Aside from the above, there are a number of issus related to specific platforms.  
+Aside from the above, there are a number of issues related to specific platforms.  
 These are listed in Specific Compiler/Library Issues.
 
 <hr>

Modified: branches/release/libs/serialization/doc/serialization.html
==============================================================================
--- branches/release/libs/serialization/doc/serialization.html	(original)
+++ branches/release/libs/serialization/doc/serialization.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -48,12 +48,13 @@
         <dt>Free Functions
       </dl>
   </dl>
-  <dt>Pointers
+  <dt>Pointers
     <dl class="page-index">
       <dt>Non-Default Constructors
       <dt>Pointers to Objects of Derived Classes
       <dl class="page-index">
         <dt>Registration
+        <dt>Export
         <dt>Instantiation
         <dt>Selective Tracking
         <dt>Runtime Casting
@@ -77,14 +78,15 @@
     <a target="detail" href="traits.html#Traits">serialization traits</a>,
     any user type can also be designated as "primitive"
     so that it is handled in this way.
-  <li>It is a class type and one of the following has been declared:
+  <li>It is a class type and one of the following has been declared according
+    to the prototypes detailed below:
     <ul>
     <li>a class member function <code style="white-space: normal">serialize</code>
     <li>a global function <code style="white-space: normal">serialize</code>
     </ul>
   <li>it is a pointer to a <strong>Serializable</strong> type.
   <li>it is a reference to a <strong>Serializable</strong> type.
-  <li>it is an native C++ Array of <strong>Serializable</strong> type.
+  <li>it is a native C++ Array of <strong>Serializable</strong> type.
 </ul>
 
 <h2><a name="primitiveoperators">Primitive Types</a></h2>
@@ -675,8 +677,9 @@
 Note that if the serialization function is split between save and load, both
 functions must include the registration.  This is required to keep the save
 and corresponding load in syncronization.
-<p>
-This will work but may be inconvenient.  We don't always know which derived
+
+<h4><a name="export">Export</a></h4>
+The above will work but may be inconvenient.  We don't always know which derived
 classes we are going to serialize when we write the code to serialize through
 a base class pointer.  Every time a new derived class is written we have to
 go back to all the places where the base class is serialized and update the
@@ -791,8 +794,8 @@
         boost::serialization::base_object&lt;base&gt;(*this);
         // method 2 : explicitly register base/derived relationship
         boost::serialization::void_cast_register&lt;derived, base&gt;(
-            static_cast&lt;base *&gt;(NULL),
-            static_cast&lt;derived *&gt;(NULL)
+            static_cast&lt;derived *&gt;(NULL),
+            static_cast&lt;base *&gt;(NULL)
         )
     }
 };
@@ -919,7 +922,7 @@
   <li>auto_ptr (demo)
 </ul>
 Others are being added to the list so check the boost files section and headers for
-new implmentations!
+new implementations!
 <hr>
 <p><i>&copy; Copyright Robert Ramey 2002-2004. 
 Distributed under the Boost Software License, Version 1.0. (See

Modified: branches/release/libs/serialization/doc/shared_ptr2.html
==============================================================================
--- branches/release/libs/serialization/doc/shared_ptr2.html	(original)
+++ branches/release/libs/serialization/doc/shared_ptr2.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -20,7 +20,7 @@
     </td>
     <td valign="top"> 
       <h1 align="center">Serialization</h1>
-      <h2 align="center"><code style="white-space: normal">shared_ptr&lt;class T&gt;</code> Revisted</h2>
+      <h2 align="center"><code style="white-space: normal">shared_ptr&lt;class T&gt;</code> Revisited</h2>
     </td>
   </tr>
 </table>
@@ -32,7 +32,7 @@
   <li>It was dependent on the Boost implementation of <code style="white-space: normal">shared_ptr</code>.
   The <code style="white-space: normal">shared_ptr</code> interface has been included
   in <code style="white-space: normal">std::tr1</code> and may someday be included in the standard
-  C++ library. An implementation which depends only on the public interface can be guarenteed to
+  C++ library. An implementation which depends only on the public interface can be guaranteed to
   function with any other future implementation of <code style="white-space: normal">shared_ptr</code>.
   <li>It required extra macros for export.
 </ul>
@@ -45,7 +45,7 @@
     const unsigned int /* file_version */
 ){
     const T * t_ptr = t.get();
-    // just seriailize the underlying raw pointer
+    // just serialize the underlying raw pointer
     ar &lt;&lt: boost::serialization::make_nvp("px", t_ptr);
 }
 
@@ -56,7 +56,7 @@
     const unsigned int file_version
 ){
     T* r;
-    // recover the underlying raw poiter
+    // recover the underlying raw pointer
     ar >> boost::serialization::make_nvp("px", r);
 
     // To Do - match up with other shared pointers which 
@@ -65,13 +65,13 @@
 }
 </code></pre>
 
-In priniciple this is very much simpler than the original implementation.  Completion of
+In principle, this is very much simpler than the original implementation.  Completion of
 this code requires:
 
 <ol>
   <li>Filling in the "To Do".  This required making an extra map for
   <code style="white-space: normal">shared_ptr</code> instances.
-  <li>A method for identifing pointers to the same objects from pointers to their base classes.
+  <li>A method for identifying pointers to the same objects from pointers to their base classes.
   <li>Backward compatibility with pointers serialized by the previous method.  This exploits
   the serialization class versioning.
   <li>Proper handling of <code style="white-space: normal">weak_ptr</code>.

Added: branches/release/libs/serialization/doc/singleton.html
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/doc/singleton.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,241 @@
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+(C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . 
+Use, modification and distribution is subject to the Boost Software
+License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+-->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../../../boost.css">
+<link rel="stylesheet" type="text/css" href="style.css">
+<title>Serialization - singleton</title>
+</head>
+<body link="#0000ff" vlink="#800080">
+<table border="0" cellpadding="7" cellspacing="0" width="100%" summary="header">
+  <tr> 
+    <td valign="top" width="300"> 
+      <h3>
</h3>
+    </td>
+    <td valign="top"> 
+      <h1 align="center">Serialization</h1>
+      <h2 align="center"><code style="white-space: normal">singleton</code></h2>
+    </td>
+  </tr>
+</table>
+<hr>
+<dl class="page-index">
+  <dt>Motivation
+  <dt>Features
+  <dt>Class Interface
+  <dt>Requirements
+  <dt>Examples
+  <dt>Multi-Threading
+</dl>
+
+<h3><a name="motivation">Motivation</a></h3>
+The serialization library relies on the existence of a number
+of static variables and tables to store information related
+to runtime types.  Examples are tables which relate exported
+names to types and tables which relate base classes to derived
+classes.  Construction, destruction and usage of these variables
+requires consideration of the following issues:
+<ul>
+  <li>Some static data variables and constants  entries refer to others.  
+  The sequence of initialization cannot be arbitrary but must be in proper
+  sequence.</li>
+  <li>A number of static variables aren't referred explicitly and, without
+  special precautions, will be stripped by most code optimizers</li>
+  <li>Many of these variables are created by templates and special care must
+  be taken to be sure that they are instantiated</li>
+  <li>In a multi-threading system, its possible that these static variables
+  will be accessed concurrently by separate threads.  This would create a
+  race condition with unpredictabe behavior</li>
+</ul>
+This singleton class addresses all of the above issues.
+
+<h3><a name="features">Features</a></h3>
+This singleton implementation has the following features:
+<ul>
+  <li>
+    Any instance will be constructed before any attempt is made to access it.</li>
+  <li>
+    Any instance created with a template is guarenteed to be instantiated.
+  <li>
+    Regardless of whether or not an instance has been explicitly
+    referred to, it will not be stripped by the optimizer when the
+    executable is built in release mode.
+  <li>
+    All instances are constructed before 
+    <code style="white-space: normal">main</code> is called
+    regardless of where they might be referenced within the program.
+    In a multi-tasking system, this guarentees that there will be no 
+    race conditions during the construction of any instance.  No
+    thread locking is required to guarentee this.
+  <li>
+    The above implies that any <code style="white-space: normal">const</code>
+    instances are thread-safe during the whole program.  Again, no
+    thread locking is required.
+  <li>
+    If a mutable instance is created, and such an instance is modified
+    after main is called in a mult-threading system, there exists
+    the possibility that a race condition will occur.  The serialization
+    library takes care that in the few places where a mutable
+    singleton is required, it is not altered after 
+    <code style="white-space: normal">main</code> is called.
+    For a more general purpose usage, thread locking on this
+    singleton could easily be implemented.  But as the serialization
+    library didn't require it, it wasn't implemented.
+</ul>
+
+<h3><a name="classinterface">Class Interface</a></h3>
+<pre><code>
+namespace boost { 
+namespace serialization {
+
+template <class T>
+class singleton : public boost::noncopyable
+{
+public:
+    static const T & get_const_instance();
+    static T & get_mutable_instance();
+};
+
+} // namespace serialization 
+} // namespace boost
+</code></pre>
+
+<dl>
+
+<dt><h4><pre><code>
+static const T & get_const_instance();</code></pre></h4></dt>
+<dd>
+Retrieve a constant reference to the singleton for this type.
+</dd>
+
+<dt><h4><pre><code>
+static T & get_mutable_instance();</code></pre></h4></dt>
+<dd>
+Retrieve a mutable reference to the singleton for this type.
+</dd>
+
+</dl>
+
+<h3><a name="requirements">Requirements</a></h3>
+In order to be used as 
+<a target="singleton.hpp" href = "../../../boost/serialization/singleton.hpp">
+<code style="white-space: normal">
+singleton&lt;T&gt;
+</code> 
+</a>
+, the type T must be default constructable.
+It doesn't require static variables - though it may have them.
+Since the library guarentees that only one instance of 
+<a target="singleton.hpp" href = "../../../boost/serialization/singleton.hpp">
+<code style="white-space: normal">
+singleton&lt;T&gt;
+</code> 
+</a>
+and all accesss is through the above static interface
+functions, common member functions of T become
+the functional equivalent of 
+<code style="white-space: normal">static</code> functions.
+
+<h3><a name="example">Examples</a></h3>
+There are at least two different ways to use this class template.
+Both are used in the serialization library.
+<p>
+The first way is illustrated by and excerpt from the file
+<code style="white-space: normal"><a target="extended_type_info" href="../src/extended_type_info.cpp">extended_type_info.cpp</a></code>.
+which contains the following code:
+
+<pre><code>
+typedef std::set<const extended_type_info *, key_compare> ktmap;
+...
+void
+extended_type_info::key_register(const char *key) {
+    ...
+    result = singleton<ktmap>::get_mutable_instance().insert(this);
+    ...
+}
+</code></pre>
+Just by referring to the singleton instance anywhere in the program
+will guarentee that one and only one instance for the specified
+type (<code style="white-space: normal">ktmap</code> in this example) 
+will exist throughout the program.  There is no need for anyother
+declaration or definition.
+<p>
+A second way is to use 
+<a target="singleton.hpp" href = "../../../boost/serialization/singleton.hpp">
+<code style="white-space: normal">
+singleton&lt;T&gt;
+</code> 
+</a>
+as one of the base classes of the type.  This is illustrated by a simplified
+excerpt from
+<a target="extended_type_info_typeid.hpp" href = "../../../boost/serialization/extended_type_info_typeid.hpp">
+<code style="white-space: normal">
+extended_type_info_typeid.hpp
+</code> 
+</a>
+
+<pre><code>
+template&lt;class T&gt;
+class extended_type_info_typeid : 
+    public detail::extended_type_info_typeid_0,
+    public singleton&lt;extended_type_info_typeid&lt;const T&gt; &gt;
+{
+    friend class singleton&lt;extended_type_info_typeid&lt;const T&gt; &gt;;
+private:
+    // private constructor to inhibit any existence other than the 
+    // static one.  Note: not all compilers support this !!!
+    extended_type_info_typeid() :
+        detail::extended_type_info_typeid_0()
+    {
+        type_register(typeid(T));
+    }
+    ~extended_type_info_typeid(){}
+    ...
+};
+</code></pre>
+
+This usage will permit a more natural syntax to be used:
+<pre><code>
+extended_type_info_typeid&lt;T&gt;::get_const_instance()
+</code></pre>
+
+Again, including one or more of the above statements anywhere
+in the program will guarentee that one and only one instance
+is created and referred to.
+
+<h3><a name="multithreading">Multi-Threading</a></h3>
+This singleton CAN be safely used in multi-threading applications if one
+is careful follow a simple rule:
+<p>
+<b>Do not call get_mutable_instance when more than one thread is running!</b>
+<p>
+All singletons used in the serialization library follow this rule.  
+In order to help detect accidental violations of this rule there
+exists an singleton lock/unlock functions.
+<pre><code>
+boost::serialization::global_lock::get_mutable_instance().lock();
+boost::serialization::global_lock::get_mutable_instance().unlock();
+</code></pre>
+In a program compiled for debug, any invocation of 
+<code style="white-space: normal">get_mutable_instance()</code>
+while the library is in a "locked" state will trap in an assertion.
+The global_lock state is initialized as "unlocked" to permit
+alteration of static variables before 
+<code style="white-space: normal">main</code> is called. All
+serialization tests invoke <code style="white-space: normal">lock()</code>
+at the start of the progam.  For programs compiled in release
+mode these functions have no effect.
+
+<hr>
+<p><i>&copy; Copyright Robert Ramey 2007. 
+Distributed under the Boost Software License, Version 1.0. (See
+accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+</i></p>
+</body>
+</html>

Modified: branches/release/libs/serialization/doc/special.html
==============================================================================
--- branches/release/libs/serialization/doc/special.html	(original)
+++ branches/release/libs/serialization/doc/special.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -27,7 +27,6 @@
 <hr>
 <dl class="page-index">
   <dt>Object Tracking
-  <dt>Exporting Class Serialization
   <dt>Class Information
   <dt>Archive Portability
   <dl class="page-index">
@@ -36,7 +35,9 @@
   </dl>
   <dt>Binary Archives
   <dt>XML Archives
+  <dt>Exporting Class Serialization
   <dt>DLLS - Serialization and Runtime Linking
+  <dt>Plugins
   <dt>Multi-Threading
   <dt>Optimizations
   <dt>Archive Exceptions
@@ -153,55 +154,6 @@
 BOOST_CLASS_TRACKING(my_virtual_base_class, boost::serialization::track_always)
 </code></pre>
 
-<h3><a name="export">Exporting Class Serialization</a></h3>
-<a target="detail" href="traits.html#export">Elsewhere</a> in this manual, we have described 
-<code style="white-space: normal">BOOST_CLASS_EXPORT</code>. This is used to make the serialization library aware
-that code should be instantiated for serialization of a given class even though the
-class hasn't been otherwise referred to by the program.  This functionality
-is necessary to implement serialization of pointers through a virtual base
-class pointer.  That is, a polymorphic pointer.
-<p>
-This macro specifies a "<b>G</b>lobally <b>U</b>nique <b>ID</b>entifier".  
-This is an string which identifies the class to be created when data is loaded.
-Generally a text representation of the class name is sufficient for this purpose, 
-but in certain cases it maybe necessary to specify a different string by using 
-<code style="white-space: normal">BOOST_CLASS_EXPORT_GUID</code> 
-rather than a simple 
-<code style="white-space: normal">BOOST_CLASS_EXPORT</code>.
-
-<p>
-<code style="white-space: normal">BOOST_CLASS_EXPORT</code> would usually 
-be specified in the same header file as the class declaration to which it 
-corresponds.  That is, <code style="white-space: normal">BOOST_CLASS_EXPORT(T)</code>
-is a "trait" of the class T. So a program using this class will look 
-something like:
-
-<pre><code>
-#include &lt;boost/archive/xml_oarchive.hpp&gt;
-.... // any other archive classes
-#include "my_class.hpp"  // which contains BOOST_CLASS_EXPORT(my_class)
-</code></pre>
-
-These headers can be in any order.  (In boost versions 1.34
-and earlier, the archive headers had to go before any headers which
-contain <code style="white-space: normal">BOOST_CLASS_EXPORT</code>.)
-Any code required to serialize types specified
-by <code style="white-space: normal">BOOST_CLASS_EXPORT</code> will be
-instantiated for each archive whose header is included.  (note that the code 
-is instantiated regardless of whether or not it is actually invoked.) 
-If no archive headers are included - no code should be instantiated. 
-This will permit <code style="white-space: normal">BOOST_CLASS_EXPORT</code> 
-to be a permanent part of the <code style="white-space: normal">my_class.hpp</code> .
-
-<p>
-Note that the implementation of this functionality depends upon vendor
-specific extensions to the C++ language.  So, there is no guarenteed portability
-of programs which use this facility.  However, all C++ compilers which
-are tested with boost provide the required extensions.  The library
-includes the extra declarations required by each of these compilers.
-It's reasonable to expect that future C++ compilers will support
-these extensions or something equivalent.
-
 <h3><a name="classinfo">Class Information</a></h3>
 By default, for each class serialized, class information is written to the archive.
 This information includes version number, implementation level and tracking
@@ -286,7 +238,7 @@
 class my_class {
     wchar_t a;
     short unsigned b;
-    template<&lt;class Archive&gt;
+    template&lt;class Archive&gt;
     Archive & serialize(Archive & ar, unsigned int version){
         ar & my_wrapper(a);
         ar & my_wrapper(b);
@@ -345,13 +297,105 @@
 So by always using <a target="detail" href="wrappers.html#nvp">name-value pairs</a>, it will
 be guarenteed that all data can be serialized to all archive classes with maximum efficiency.
 
+<h3><a name="export">Exporting Class Serialization</a></h3>
+<a target="detail" href="traits.html#export">Elsewhere</a> in this manual, we have described 
+<code style="white-space: normal">BOOST_CLASS_EXPORT</code>. 
+Export implies two things:
+<ul>
+<li>Instantiates code which is not otherwise referred to.
+<li>Associates an external identifier with the class to be serialized.
+The fact that the class isn't explicitly referred to implies this
+requirement.
+</ul>
+In C++, usage of code not explicitly referred to is implemented via
+virtual functions.  Hence, the need for export is implied by the 
+usage of a derived class that is manipulated via a pointer or
+reference to it's base class.
+
+<p>
+<code style="white-space: normal">BOOST_CLASS_EXPORT</code> in the same
+source module that includes any of the archive class headers will
+instantiate code required to serialize polymorphic pointers of
+the indicated type to the all those archive classes. If no
+archive class headers are included, then no code will be instantiated.
+
+<p>
+Note that the implemenation of this functionality requires
+that the <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+macro appear <b>after</b> and the inclusion of any archive
+class headers for which code is to be instantiated.
+So, code that uses <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+will look like the following:
+<pre><code>
+#include &lt;boost/archive/text_oarchive.hpp&gt;
+#include &lt;boost/archive/text_oarchive.hpp&gt;
+... // other archives
+
+#include "a.hpp" // header declaration for class a
+BOOST_CLASS_EXPORT(a)
+... // other class headers and exports
+</code></pre>
+This will be true regardless of whether the is part
+of a stand alone executable, a static library or
+a dyanmic or shared library.  
+<p>
+Note that including
+<code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+in the "a.hpp" header itself as one would do with
+other serialization traits will make it difficult
+or impossible to follow the rule above regarding
+inclusion of archive headers before
+<code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+is invoked.  This is different than other serialization
+traits which would normally be included in same file
+as the class declaration.
+
+<p>
+This system has certain implications for placing code in static or shared
+libraries.  Placing <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+in library code will have no effect unless archive class headers are
+also included.  So when building a library, one should include all headers
+for all the archive classes which he anticipates using. Alternatively,
+one can include headers for just the
+Polymoprhic Archives.
+Also, when making shared libraries, there is currently a restriction
+that only one such library can use <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+for any given type. All this will most likely make it inconvenient
+to include <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+as part of the header of the class to be serialized. So, <b>the 
+best way to use <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+is to include it in the same module which implements the class</b>.
+
+<p>
+Strictly speaking, export should not be necessary if all pointer serialization
+occurs through the most derived class.  However, in order to detect
+what would be catastophic error, the library traps ALL serializations through
+a pointer to a polymorphic which are not exported or otherwise registered.
+So, in practice, be prepared to register or export all classes with one
+or more virtual functions which are serialized through a pointer. 
+
+<p>
+Note that the implementation of this functionality depends upon vendor
+specific extensions to the C++ language.  So, there is no guarenteed portability
+of programs which use this facility.  However, all C++ compilers which
+are tested with boost provide the required extensions.  The library
+includes the extra declarations required by each of these compilers.
+It's reasonable to expect that future C++ compilers will support
+these extensions or something equivalent.
+
 <h3><a name="dlls">DLLS - Serialization and Runtime Linking</a></h3>
 Serialization code can be placed in libraries to be linked at runtime.  That is,
-code can be placed in DLLS(Windows) or Shared Libraries(*nix).  
-Along with the "export" facility, this
-permits a program to written without knowledge of the actual types to be serialized.
-This package doesn't include an example of this technique - but coding would be
-very similar to the example 
+code can be placed in DLLS(Windows) Shared Libraries(*nix), or static libraries
+as well as the main executable.  As long as
+
+<a target="detail" href="serialization.html#export">
+<code style="white-space: normal">BOOST_CLASS_EXPORT</code>
+</a>
+
+is not used, The serialization library imposes no special requirements
+that need be taken into account when distributing code among various modules.
+<p>
+For static libraries, this is illustrated by
 <a href = "../example/demo_pimpl.cpp" target="demo_pimpl">
 <code style="white-space: normal">demo_pimpl.cpp</code>
 </a>,
@@ -362,52 +406,91 @@
 <a href = "../example/demo_pimpl_A.hpp" target="demo_pimpl">
 <code style="white-space: normal">demo_pimpl_A.hpp</code>
 </a>
-where implementation of serializaton is completely separate
-from the main program.
+where implementation of serializaton is in a static library 
+completely separate from the main program.
+
+<p>
+For runtime linked libraries this is illustrated by one of the tests:
+
+<a href = "../test/test_dll_simple.cpp" target="test_dll_simple">
+<code style="white-space: normal">test_dll_simple</code>
+</a>,
+and
+<a href = "../test/dll_A.cpp" target="dll_A">
+<code style="white-space: normal">dll_A.cpp</code>
+</a>
+where implementation of serializaton is also completely separate
+from the main program but the code is loaded at runtime.  In this
+example, this code is loaded automatically when the program which
+uses it starts up, but it could just as well be loaded and unloaded 
+with an OS dependent API call.
+
+<h3><a name="plugins">Plugins</a></h3>
+In order to implement the library, various facilities for runtime
+manipulation of types are runtime were required.  These
+are <a target="detail" href="extended_type_info.html"><code>extended_type_info</code></a>
+for associating classes with external identifying strings (<b>GUID</b>)
+and <a target="detail" href="void_cast.html"><code>void_cast</code></a>
+for casting between pointers of related types.
+
+To complete the functionality of 
+<a target="detail" href="extended_type_info.html"><code>extended_type_info</code></a>
+the ability to construct and destroy corresponding types has been
+added.  In order to use this functionality, one must specify
+how each type is created.  This should be done at the time
+a class is exported.  So, a more complete example of the code above would be:
+
+<pre><code>
+#include &lt;boost/archive/text_oarchive.hpp&gt;
+#include &lt;boost/archive/text_oarchive.hpp&gt;
+... // other archives
+
+#include "a.hpp" // header declaration for class a
+
+// this class has a default constructor
+BOOST_SERIALIZATION_FACTORY_0(a)
+// as well as one that takes one integer argument
+BOOST_SERIALIZATION_FACTORY_1(a, int)
+
+// specify the GUID for this class
+BOOST_CLASS_EXPORT(a)
+... // other class headers and exports
+</code></pre>
+
+With this in place, one can construct, serialize and destroy
+about which only is know the <b>GUID</b> and a base class.
+
 
 <h3><a name="multi_threading">Multi-Threading</a></h3>
-The nature of serialization would conflict with multiple thread concurrently
-writing/reading from/to a single open archive.  Since each archive is
-independent from ever other one, there should be no problem
-in having multiple open archives from one or more threads.
-<p>
-Well, not quite.
-<p>
-There are a couple of global data structures for holding
-information of serializable types.  These structures are
-used to dispatch to correct code to handle each pair
-of serializable types and archive types.  Since this
-information is shared among all archives, there is 
-potential for problems.  This has been addressed
-carefully implementing the library so that these 
-structures are all initialized before 
-<code style="white-space: normal">main(...)</code>
-is called.  From then on they are never altered.  So
-there SHOULD be no problem having mulitple archives
-open simultaneously - be it from the same or different
-threads.
-<p>
-Well, almost.
-<p>
-With dynamically loaded code - DLLS or Shared Libraries, 
-these global data structures can be altered when a library
-is loaded or unloaded.  That is, in this case, these
-globa data structures can be altered after 
-<code style="white-space: normal">main(...)</code>
-is called.  So if a thread is dynamically loading/unloading
-modules which contain serialization code while an 
-archive is open there could be problems.  Also, if
-such loading/unloading is happening concurrently
-in different threads, there could also be problems.
-<p>
-It might not be easy to control this.  Is possible that
-some systems may not actually load modules until they
-are actually needed.  So even though we think that
-there is not dynamic loading/unloading of such code
-it could be occurring as "help" to manage resources.
-On such systems, access to archive code would have 
-to be syncronized with some multi-threading construct
-in order to be functional.
+The fundamental purpose of serialization would conflict with multiple 
+thread concurrently writing/reading from/to a single open archive instance.
+The library implementation presumes that the application avoids such an situtation.
+<p>
+However, Writing/Reading different archives simultaneously
+in different tasks is permitted as each archive instance is (almost) 
+completely independent from any other archive instance.  The only shared 
+information are some type tables which have been implemented using a 
+lock-free thread-safe 
+<a target="detail" href="singleton.html">
+<code style="white-space: normal">singleton</code>
+</a>
+described elsewhere in this documentation.
+<p>
+This singleton implementation guarentees that all of this shared
+information is initialized when the code module which contains
+them is loaded.  The serialization library takes care to
+ensure that these data structures are not subsequently
+modified. The only time there could be a problem would
+be if code is loaded/unloaded while another task is
+serializing data.  This could only occur for types whose 
+serialization is implemented in a dynamically loaded/unload DLL
+or shared library.  So if the following is avoided:
+<ul>
+    <li>Accessing the same archive instance from different tasks.
+    <li>Loading/Unloading DLLS or shared libraries while any archive
+    instances are open.
+</ul>
+The library should be thread safe.
 
 <h3><a name="optimizations">Optimizations</a></h3>
 In performance critical applications that serialize large sets of contiguous data of homogeneous

Modified: branches/release/libs/serialization/doc/static_warning.html
==============================================================================
--- branches/release/libs/serialization/doc/static_warning.html	(original)
+++ branches/release/libs/serialization/doc/static_warning.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -25,7 +25,25 @@
   </tr>
 </table>
 <hr>
-To do.
+
+The header <code>&lt;boost/static_warning.hpp&gt;</code> supplies a single macro 
+<code style="white-space: normal">BOOST_STATIC_WARNING(x)</code>, which generates a compile time warning message if 
+the integral-constant-expression x is not true. 
+<p>
+Note that if the condition is true, then the macro will generate neither 
+code nor data - and the macro can also be used at either namespace, 
+class or function scope. When used in a template, the expression x 
+will be evaluated at the time the template is instantiated; this is 
+particularly useful for validating template parameters. 
+<p>
+It is intended that the functioning of <code style="white-space: normal">BOOST_STATIC_WARNING(x)</code>
+be identical to that of <code style="white-space: normal">BOOST_STATIC_ASSERT(x)</code>
+except that rather than resulting in a compilation error, it will result in
+a compiler warning.  In all other respects it should be the same.  So
+for more information on using <code style="white-space: normal">BOOST_STATIC_WARNING(x)</code>
+consult the documentation for <code style="white-space: normal">BOOST_STATIC_ASSERT(x)</code>
+here.
+
 <hr>
 <p><i>&copy; Copyright Robert Ramey 2002-2004. 
 Distributed under the Boost Software License, Version 1.0. (See

Added: branches/release/libs/serialization/doc/todo.html
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/doc/todo.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,113 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+(C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . 
+Use, modification and distribution is subject to the Boost Software
+License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+-->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../../../boost.css">
+<link rel="stylesheet" type="text/css" href="style.css">
+<title>Serialization - To Do</title>
+</head>
+<body link="#0000ff" vlink="#800080">
+<table border="0" cellpadding="7" cellspacing="0" width="100%" summary="header">
+  <tr> 
+    <td valign="top" width="300"> 
+      <h3>
</h3>
+    </td>
+    <td valign="top"> 
+      <h1 align="center">Serialization</h1>
+      <h2 align="center">To Do</h2>
+    </td>
+  </tr>
+</table>
+<hr>
+<dl class="index">
+  <dt>Portable Binary Archives</dt>
+  <dt>Performance Testing and Profiling</dt>
+  <dt>Back Versioning</dt>
+  <dt>Testing for Environments with No RTTI</dt>
+  <dt>Additional Case Studies</dt>
+</dl>
+
+These are enhancements that the serialization library needs but have not been done.
+Some of these projects, though tricky, are not huge and would be suitable
+for someone who has a limited time to spend on them.  In particular, they
+might be of interest as student projects such as the Google Summer of Code.
+
+<h2><a name="portablebinaryarchives"></a>Portable Binary Archives</h2>
+Currently there is a portable binary archive in the examples directory.
+It is not regularly submitted to the exhaustive boost testing regimen
+but it is tested occasionally and has been used in production code.
+<p>
+Its missing the following:
+<ul>
+  <li>Addition of portable floating point types.  This is not trivial.  In addition to
+  handling floating point types of varying sizes, It requires
+  handling invalid floating point numbers (NaNs) in a portable manner.
+  <li>Some way to test archive portability within the Boost testing regimen.
+  <li>Integration into the Boost testing similar to the other archive classes.
+</ul>
+
+<h2><a name="performancetesting"></a>Performance Testing and Profiling</h2>
+
+I've managed to setup performance profiling using the following:
+<ul>
+  <li>current (as I write this) Boost.Build tools.
+  <li>the gcc compiler.
+  <li>and a shell script - profile.sh
+  <li>library_status program from the tools/regression/src directory
+</ul>
+Invoking profile script produces a 
+<a href=performance_status.html">table</a>
+which shows the results of each test and links to the actual
+profile.
+<p>
+The first thing I did was include some of the serialization library tests.
+It became immediatly apparent that these tests were totally unsuitable
+for performance testing and that new tests needed to be written for this 
+purpose.  These tests would highlight the location of any performance
+bottlenecks in the serialization library.  Whenever I've subjected my
+code in the past to this type of analysis, I've always been suprised
+to find bottlenecks in totally unanticipated places and fixing those
+has always lead to large improvements in performance.  I expect that
+this project would have a huge impact on the utility of the serialization
+library.
+
+<h2><a name="backversioning"></a>Back Versioning</h2>
+
+It has been suggested that a useful feature of the library would be
+the ability to create "older versions" of archives.  Currently,
+the library permits one make programs that are guarenteed
+the ability to load archives with classes of a previous version. 
+But there is not way to save classes in accordance with a
+previous version.  At first I dismissed this a a huge project
+with small demand.  A cursory examination of the code revealed
+that this would not be very difficult.  It would require some
+small changes in code and some additional tests.  Also it
+would require special treatment in the documentation - perhaps
+a case study.
+
+
+<h2><a name="nortti"></a>Environments without RTTI</h2>
+
+I note that some have commented that this library requires RTTI.
+This is not strictly true.  The examples and almost all the
+tests presume the existence of RTTI.  But it should be possible
+to use the library without it.  The example used for testing is an 
+<code style="white-space: normal">extended_typeinfo</code> 
+implemenation which presumes that all classes names have been exported. 
+So, to make this library compatible for platforms without RTTI, 
+a set of tests, examples and new manual section would have to be created
+
+<hr>
+<p>Revised 1 November, 2008 
+<p><i>&copy; Copyright Robert Ramey 2002-2008. 
+Distributed under the Boost Software License, Version 1.0. (See
+accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+</i></p>
+</body>
+</html>

Modified: branches/release/libs/serialization/doc/traits.html
==============================================================================
--- branches/release/libs/serialization/doc/traits.html	(original)
+++ branches/release/libs/serialization/doc/traits.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -179,7 +179,7 @@
   That is, addresses of addresses are not tracked by default.
   <li>All current serialization wrappers such as <code style="white-space: normal">boost::serialization::nvp</code>,
   <code style="white-space: normal">track_never</code>.
-  <li>For all other types, <code style="white-space: normal">track_selectivly</code>.
+  <li>For all other types, <code style="white-space: normal">track_selectively</code>.
   That is addresses of serialized objects are tracked if and only if
   one or more of the following is true:
   <ul>
@@ -242,23 +242,20 @@
 </code></pre>
 If the an external name is required somewhere in the program and none
 has been assigned, a static assertion will be invoked.
+
 <h3><a name="abstract">Abstract</a></h3>
-When serializing an object through a pointer to its base class
-and that base class is abstract (i.e. has at least one virtual function
-assigned a value of 0), A compile error will be emitted.  This is
-addressable in one over several ways:
-<ul>
-  <li>remove the =0 in the base classes so that the base class is no
-  longer abstract.
-  <li>implement is_abstract for your compiler. (code written according to
-  the C++ standard is included with this library.  But it is known to fail
-  on several compilers.
-  <li>use the macro <code style="white-space: normal">BOOST_IS_ABSTRACT(my_class)</code> to indicate
-  that the class is an abstract base class.  This will cause the compiler
-  to avoid generating code that causes this error.
-  This macro must be used in the global namespace, with full namespace 
-  qualification of the argument class. 
-</ul>
+When serializing an object through a pointer to its base class,
+the library needs to determine whether or not the bas is abstract
+(i.e. has at least one virtual function).  The library uses the
+type trait macro <code style="white-space: normal">BOOST_IS_ABSTRACT(T)</code>
+to do this.  Not all compilers support this type trait and corresponding
+macro.  To address this, the macro <code style="white-space: normal">
+BOOST_SERIALIZATION_ASSUME_ABSTRACT(T)</code> has been
+implemented to permit one to explicitly indicate that a specified
+type is in fact abstract.  This will guarentee that
+<code style="white-space: normal">BOOST_IS_ABSTRACT</code>
+will return the correct value for all compilers.
+
 <h3><a name="typeinfo">Type Information Implementation</a></h3>
 This last trait is also related to the serialization of objects
 through a base class pointer.  The implementation of this facility
@@ -471,6 +468,34 @@
 <tr><td><code>IsWrapper</code></td><td><code></code>is the type a wrapper?</td><td><code>mpl::false_<br>mpl::true_</code></td><td><code>mpl::false_</code></td></tr>
 </table>
 
+<<<<<<< .working
+
+<h3><a name="tracking">Bitwise serialization</a></h3>
+Some simple classes could be serialized just by directly copying all bits
+of the class. This is, in particular, the case for POD data types containing
+no pointer members, and which are neither versioned nor tracked. Some archives, 
+such as non-portable binary archives can make us of this information to 
+substantially speed up serialization.
+
+To indicate the possibility of bitwise serialization the type trait defined 
+in the header
+file is_bitwise_serializable.hpp
+is used:
+<pre><code>
+namespace boost { namespace serialization {
+    template<class T>
+    struct is_bitwise_serializable
+     : public is_arithmetic<T>
+    {};
+} }
+</code></pre>
+is used, and can be specialized for other classes. The specialization
+is made easy by the corresponding macro:
+<pre><code>
+BOOST_IS_BITWISE_SERIALIZABLE(my_class)
+</code></pre>
+
+=======
 
 <h3><a name="tracking">Bitwise serialization</a></h3>
 Some simple classes could be serialized just by directly copying all bits
@@ -497,6 +522,7 @@
 BOOST_IS_BITWISE_SERIALIZABLE(my_class)
 </code></pre>
 
+>>>>>>> .merge-right.r41077
 <hr>
 <p><i>&copy; Copyright Robert Ramey 2002-2004 and Matthias Troyer 2006. 
 Distributed under the Boost Software License, Version 1.0. (See

Modified: branches/release/libs/serialization/doc/tutorial.html
==============================================================================
--- branches/release/libs/serialization/doc/tutorial.html	(original)
+++ branches/release/libs/serialization/doc/tutorial.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -123,7 +123,7 @@
     gps_position newg;
     {
         // create and open an archive for input
-        std::ifstream ifs("filename", std::ios::binary);
+        std::ifstream ifs("filename");
         boost::archive::text_iarchive ia(ifs);
         // read class state from archive
         ia &gt;&gt; newg;

Modified: branches/release/libs/serialization/doc/void_cast.html
==============================================================================
--- branches/release/libs/serialization/doc/void_cast.html	(original)
+++ branches/release/libs/serialization/doc/void_cast.html	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -44,8 +44,8 @@
 template&lt;class Derived, class Base&gt;
 const void_cast_detail::void_caster &
 void_cast_register(
-    const Derived * derived = NULL, 
-    const Base * base = NULL
+    Derived const * derived = NULL, 
+    Base * const base = NULL
 )
 </code></pre></h4></dt>
 <dd>

Added: branches/release/libs/serialization/example/Jamfile.v2
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/Jamfile.v2	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,55 @@
+# Boost serialization Library Build Jamfile
+#  (C) Copyright Robert Ramey 2002-2004.
+#  Use, modification, and distribution are subject to the
+#  Boost Software License, Version 1.0. (See accompanying file
+#  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+#  See http://www.boost.org/libs/serialization for the library home page.
+
+project libs/serialization/example
+    : id serialization_test
+    : requirements <library>../build//boost_serialization
+    ;
+
+rule demo_bsl_run ( demo-name : othersources * : requirements * )
+{
+    return [ run
+        # sources
+            $(demo-name).cpp 
+            $(othersources).cpp
+        : # command
+        : # input files
+        : # requirements
+            # toolset suppress-warnings
+            <toolset>gcc:<cxxflags>"-Wno-non-virtual-dtor -Wno-ctor-dtor-privacy"
+            <toolset>msvc-8.0:<cxxflags>"-wd4996"
+            <toolset>borland:<cxxflags>"-w-8080 -w-8071 -w-8057 -w-8062 -w-8008 -w-0018 -w-8066"
+            # toolset optimizations
+            <toolset>gcc:<cxxflags>"-ftemplate-depth-255"
+            <toolset>msvc:<cxxflags>"-Gy"
+            # toolset shared library support
+            <toolset>como,<runtime-link>shared:<build>no
+            <toolset>msvc,<stdlib>stlport,<runtime-link>shared:<build>no
+            <toolset>cw,<runtime-link>static:<build>no
+            $(requirements)
+         : # test name
+            $(demo-name)
+       ]
+    ;
+}
+
+test-suite "demo-suite" :
+    # demos
+    [ demo_bsl_run demo ]
+    [ demo_bsl_run demo_auto_ptr ]
+    [ demo_bsl_run demo_exception ]
+    [ demo_bsl_run demo_fast_archive ]
+    [ demo_bsl_run demo_pimpl : demo_pimpl_A ]
+    [ demo_bsl_run demo_polymorphic : demo_polymorphic_A ]
+    [ demo_bsl_run demo_portable_archive : portable_binary_iarchive portable_binary_oarchive ]
+    [ demo_bsl_run demo_shared_ptr ]
+    [ demo_bsl_run demo_xml ]
+    [ demo_bsl_run demo_xml_save ]
+    [ demo_bsl_run demo_xml_load : : <dependency>demo_xml_save ]
+;
+

Modified: branches/release/libs/serialization/example/demo.cpp
==============================================================================
--- branches/release/libs/serialization/example/demo.cpp	(original)
+++ branches/release/libs/serialization/example/demo.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -7,6 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
+#include <cstddef> // NULL
 #include <iomanip>
 #include <iostream>
 #include <fstream>
@@ -20,7 +21,7 @@
 #include <boost/serialization/base_object.hpp>
 #include <boost/serialization/utility.hpp>
 #include <boost/serialization/list.hpp>
-#include <boost/serialization/is_abstract.hpp>
+#include <boost/serialization/assume_abstract.hpp>
 
 /////////////////////////////////////////////////////////////
 // The intent of this program is to serve as a tutorial for
@@ -93,7 +94,7 @@
     virtual ~bus_stop(){}
 };
 
-BOOST_IS_ABSTRACT(bus_stop)
+BOOST_SERIALIZATION_ASSUME_ABSTRACT(bus_stop)
 
 std::ostream & operator<<(std::ostream &os, const bus_stop &bs)
 {

Added: branches/release/libs/serialization/example/demo_dll.cpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/demo_dll.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,50 @@
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// test_derived_class.cpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+// should pass compilation and execution
+
+#include <cstddef> // NULL
+#include <fstream>
+
+#include <cstdio> // remove
+#include <boost/config.hpp>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{ 
+    using ::remove;
+}
+#endif
+
+#include "test_tools.hpp"
+
+#include "B.hpp"
+#include "A.ipp"
+
+int test_main( int argc, char* argv[] )
+{
+  const char * testfile = boost::archive::tmpnam(NULL);
+  
+  BOOST_REQUIRE(NULL != testfile);
+
+    B b, b1;
+
+    {   
+        test_ostream os(testfile, TEST_STREAM_FLAGS);
+        test_oarchive oa(os, TEST_ARCHIVE_FLAGS);
+        oa << boost::serialization::make_nvp("b", b);
+    }
+    {
+        test_istream is(testfile, TEST_STREAM_FLAGS);
+        test_iarchive ia(is, TEST_ARCHIVE_FLAGS);
+        ia >> boost::serialization::make_nvp("b1", b1);
+    }
+    BOOST_CHECK(b == b1);
+    std::remove(testfile);
+    return EXIT_SUCCESS;
+}
+
+// EOF

Added: branches/release/libs/serialization/example/demo_dll_a.hpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/demo_dll_a.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,321 @@
+#ifndef BOOST_SERIALIZATION_TEST_A_HPP
+#define BOOST_SERIALIZATION_TEST_A_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// A.hpp    simple class test
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <cassert>
+#include <cstdlib> // for rand()
+#include <cmath> // for fabs()
+#include <cstddef> // size_t
+
+#include <boost/config.hpp>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+    using ::rand; 
+    using ::fabs;
+    using ::size_t;
+}
+#endif
+
+//#include <boost/test/test_exec_monitor.hpp>
+#include <boost/limits.hpp>
+#include <boost/cstdint.hpp>
+
+#include <boost/detail/workaround.hpp>
+#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+#include <boost/archive/dinkumware.hpp>
+#endif
+
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/string.hpp>
+#include <boost/serialization/access.hpp>
+
+class A
+{
+private:
+    friend class boost::serialization::access;
+    // note: from an aesthetic perspective, I would much prefer to have this
+    // defined out of line.  Unfortunately, this trips a bug in the VC 6.0
+    // compiler. So hold our nose and put it her to permit running of tests.
+    template<class Archive>
+    void serialize(
+        Archive &ar,
+        const unsigned int /* file_version */
+    ){
+        ar & BOOST_SERIALIZATION_NVP(b);
+        #ifndef BOOST_NO_INT64_T
+        ar & BOOST_SERIALIZATION_NVP(f);
+        ar & BOOST_SERIALIZATION_NVP(g);
+        #endif
+        #if BOOST_WORKAROUND(__BORLANDC__,  <= 0x551 )
+            int i;
+            if(BOOST_DEDUCED_TYPENAME Archive::is_saving::value){
+                i = l;
+                ar & BOOST_SERIALIZATION_NVP(i);
+            }
+            else{
+                ar & BOOST_SERIALIZATION_NVP(i);
+                l = i;
+            }
+        #else
+            ar & BOOST_SERIALIZATION_NVP(l);
+        #endif
+        ar & BOOST_SERIALIZATION_NVP(m);
+        ar & BOOST_SERIALIZATION_NVP(n);
+        ar & BOOST_SERIALIZATION_NVP(o);
+        ar & BOOST_SERIALIZATION_NVP(p);
+        ar & BOOST_SERIALIZATION_NVP(q);
+        #ifndef BOOST_NO_CWCHAR
+        ar & BOOST_SERIALIZATION_NVP(r);
+        #endif
+        ar & BOOST_SERIALIZATION_NVP(c);
+        ar & BOOST_SERIALIZATION_NVP(s);
+        ar & BOOST_SERIALIZATION_NVP(t);
+        ar & BOOST_SERIALIZATION_NVP(u);
+        ar & BOOST_SERIALIZATION_NVP(v);
+        ar & BOOST_SERIALIZATION_NVP(w);
+        ar & BOOST_SERIALIZATION_NVP(x);
+        ar & BOOST_SERIALIZATION_NVP(y);
+        #ifndef BOOST_NO_STD_WSTRING
+        ar & BOOST_SERIALIZATION_NVP(z);
+        #endif
+    }
+    bool b;
+    #ifndef BOOST_NO_INT64_T
+    boost::int64_t f;
+    boost::uint64_t g;
+    #endif
+    enum h {
+        i = 0,
+        j,
+        k
+    } l;
+    std::size_t m;
+    signed long n;
+    unsigned long o;
+    signed  short p;
+    unsigned short q;
+    #ifndef BOOST_NO_CWCHAR
+    wchar_t r;
+    #endif
+    char c;
+    signed char s;
+    unsigned char t;
+    signed int u;
+    unsigned int v;
+    float w;
+    double x;
+    std::string y;
+    #ifndef BOOST_NO_STD_WSTRING
+    std::wstring z;
+    #endif
+public:
+    A();
+    bool operator==(const A &rhs) const;
+    bool operator!=(const A &rhs) const;
+    bool operator<(const A &rhs) const; // used by less
+    // hash function for class A
+    operator std::size_t () const;
+    friend std::ostream & operator<<(std::ostream & os, A const & a);
+    friend std::istream & operator>>(std::istream & is, A & a);
+};
+
+//BOOST_TEST_DONT_PRINT_LOG_VALUE(A);
+
+template<class S>
+void randomize(S &x)
+{
+    assert(0 == x.size());
+    for(;;){
+        unsigned int i = std::rand() % 27;
+        if(0 == i)
+            break;
+        x += static_cast<BOOST_DEDUCED_TYPENAME S::value_type>('a' - 1 + i);
+    }
+}
+
+template<class T>
+void accumulate(std::size_t & s, const T & t){
+    const char * tptr = (const char *)(& t);
+    unsigned int count = sizeof(t);
+    while(count-- > 0){
+        s += *tptr++;
+    }
+}
+
+A::operator std::size_t () const {
+    std::size_t retval = 0;
+    accumulate(retval, b);
+    #ifndef BOOST_NO_INT64_T
+    accumulate(retval, f);
+    accumulate(retval, g);
+    #endif
+    accumulate(retval, l);
+    accumulate(retval, m);
+    accumulate(retval, n);
+    accumulate(retval, o);
+    accumulate(retval, p);
+    accumulate(retval, q);
+    #ifndef BOOST_NO_CWCHAR
+    accumulate(retval, r);
+    #endif
+    accumulate(retval, c);
+    accumulate(retval, s);
+    accumulate(retval, t);
+    accumulate(retval, u);
+    accumulate(retval, v);
+    return retval;
+}
+
+inline A::A() :
+    b(true),
+    #ifndef BOOST_NO_INT64_T
+    f(std::rand() * std::rand()),
+    g(std::rand() * std::rand()),
+    #endif
+    l(static_cast<enum h>(std::rand() % 3)),
+    m(std::rand()),
+    n(std::rand()),
+    o(std::rand()),
+    p(std::rand()),
+    q(std::rand()),
+    #ifndef BOOST_NO_CWCHAR
+    r(std::rand()),
+    #endif
+    c(std::rand()),
+    s(std::rand()),
+    t(std::rand()),
+    u(std::rand()),
+    v(std::rand()),
+    w((float)std::rand()),
+    x((double)std::rand())
+{
+    randomize(y);
+    #ifndef BOOST_NO_STD_WSTRING
+    randomize(z);
+    #endif
+}
+
+inline bool A::operator==(const A &rhs) const
+{
+    if(b != rhs.b)
+        return false;
+    if(l != rhs.l)
+        return false;
+    #ifndef BOOST_NO_INT64_T
+    if(f != rhs.f)
+        return false;
+    if(g != rhs.g)
+        return false;
+    #endif
+    if(m != rhs.m)
+        return false;
+    if(n != rhs.n)
+        return false;
+    if(o != rhs.o)
+        return false;
+    if(p != rhs.p)
+        return false; 
+    if(q != rhs.q)
+        return false;
+    #ifndef BOOST_NO_CWCHAR
+    if(r != rhs.r)
+        return false; 
+    #endif
+    if(c != rhs.c)
+        return false;
+    if(s != rhs.s)
+        return false;
+    if(t != rhs.t)
+        return false;
+    if(u != rhs.u)
+        return false; 
+    if(v != rhs.v)
+        return false; 
+    if(w == 0 && std::fabs(rhs.w) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(std::fabs(rhs.w/w - 1.0) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(x == 0 && std::fabs(rhs.x - x) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(std::fabs(rhs.x/x - 1.0) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(0 != y.compare(rhs.y))
+        return false;
+    #ifndef BOOST_NO_STD_WSTRING
+    if(0 != z.compare(rhs.z))
+        return false;
+    #endif      
+    return true;
+}
+
+inline bool A::operator!=(const A &rhs) const
+{
+    return ! (*this == rhs);
+}
+
+inline bool A::operator<(const A &rhs) const
+{
+    if(b != rhs.b)
+        return b < rhs.b;
+    #ifndef BOOST_NO_INT64_T
+    if(f != rhs.f)
+        return f < rhs.f;
+    if(g != rhs.g)
+        return g < rhs.g;
+    #endif
+    if(l != rhs.l )
+        return l < rhs.l;
+    if(m != rhs.m )
+        return m < rhs.m;
+    if(n != rhs.n )
+        return n < rhs.n;
+    if(o != rhs.o )
+        return o < rhs.o;
+    if(p != rhs.p )
+        return p < rhs.p;
+    if(q != rhs.q )
+        return q < rhs.q;
+    #ifndef BOOST_NO_CWCHAR
+    if(r != rhs.r )
+        return r < rhs.r;
+    #endif
+    if(c != rhs.c )
+        return c < rhs.c;
+    if(s != rhs.s )
+        return s < rhs.s;
+    if(t != rhs.t )
+        return t < rhs.t;
+    if(u != rhs.u )
+        return u < rhs.u; 
+    if(v != rhs.v )
+        return v < rhs.v;
+    if(w != rhs.w )
+        return w < rhs.w; 
+    if(x != rhs.x )
+        return x < rhs.x;
+    int i = y.compare(rhs.y);
+    if(i !=  0 )
+        return i < 0;
+    #ifndef BOOST_NO_STD_WSTRING
+    int j = z.compare(rhs.z);
+    if(j !=  0 )
+        return j < 0;
+    #endif
+    return false;
+}
+
+#endif // BOOST_SERIALIZATION_TEST_A_HPP

Added: branches/release/libs/serialization/example/demo_dll_a.ipp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/demo_dll_a.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,321 @@
+#ifndef BOOST_SERIALIZATION_TEST_A_HPP
+#define BOOST_SERIALIZATION_TEST_A_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// A.hpp    simple class test
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <cassert>
+#include <cstdlib> // for rand()
+#include <cmath> // for fabs()
+#include <cstddef> // size_t
+
+#include <boost/config.hpp>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+    using ::rand; 
+    using ::fabs;
+    using ::size_t;
+}
+#endif
+
+//#include <boost/test/test_exec_monitor.hpp>
+#include <boost/limits.hpp>
+#include <boost/cstdint.hpp>
+
+#include <boost/detail/workaround.hpp>
+#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+#include <boost/archive/dinkumware.hpp>
+#endif
+
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/string.hpp>
+#include <boost/serialization/access.hpp>
+
+class A
+{
+private:
+    friend class boost::serialization::access;
+    // note: from an aesthetic perspective, I would much prefer to have this
+    // defined out of line.  Unfortunately, this trips a bug in the VC 6.0
+    // compiler. So hold our nose and put it her to permit running of tests.
+    template<class Archive>
+    void serialize(
+        Archive &ar,
+        const unsigned int /* file_version */
+    ){
+        ar & BOOST_SERIALIZATION_NVP(b);
+        #ifndef BOOST_NO_INT64_T
+        ar & BOOST_SERIALIZATION_NVP(f);
+        ar & BOOST_SERIALIZATION_NVP(g);
+        #endif
+        #if BOOST_WORKAROUND(__BORLANDC__,  <= 0x551 )
+            int i;
+            if(BOOST_DEDUCED_TYPENAME Archive::is_saving::value){
+                i = l;
+                ar & BOOST_SERIALIZATION_NVP(i);
+            }
+            else{
+                ar & BOOST_SERIALIZATION_NVP(i);
+                l = i;
+            }
+        #else
+            ar & BOOST_SERIALIZATION_NVP(l);
+        #endif
+        ar & BOOST_SERIALIZATION_NVP(m);
+        ar & BOOST_SERIALIZATION_NVP(n);
+        ar & BOOST_SERIALIZATION_NVP(o);
+        ar & BOOST_SERIALIZATION_NVP(p);
+        ar & BOOST_SERIALIZATION_NVP(q);
+        #ifndef BOOST_NO_CWCHAR
+        ar & BOOST_SERIALIZATION_NVP(r);
+        #endif
+        ar & BOOST_SERIALIZATION_NVP(c);
+        ar & BOOST_SERIALIZATION_NVP(s);
+        ar & BOOST_SERIALIZATION_NVP(t);
+        ar & BOOST_SERIALIZATION_NVP(u);
+        ar & BOOST_SERIALIZATION_NVP(v);
+        ar & BOOST_SERIALIZATION_NVP(w);
+        ar & BOOST_SERIALIZATION_NVP(x);
+        ar & BOOST_SERIALIZATION_NVP(y);
+        #ifndef BOOST_NO_STD_WSTRING
+        ar & BOOST_SERIALIZATION_NVP(z);
+        #endif
+    }
+    bool b;
+    #ifndef BOOST_NO_INT64_T
+    boost::int64_t f;
+    boost::uint64_t g;
+    #endif
+    enum h {
+        i = 0,
+        j,
+        k
+    } l;
+    std::size_t m;
+    signed long n;
+    unsigned long o;
+    signed  short p;
+    unsigned short q;
+    #ifndef BOOST_NO_CWCHAR
+    wchar_t r;
+    #endif
+    char c;
+    signed char s;
+    unsigned char t;
+    signed int u;
+    unsigned int v;
+    float w;
+    double x;
+    std::string y;
+    #ifndef BOOST_NO_STD_WSTRING
+    std::wstring z;
+    #endif
+public:
+    A();
+    bool operator==(const A &rhs) const;
+    bool operator!=(const A &rhs) const;
+    bool operator<(const A &rhs) const; // used by less
+    // hash function for class A
+    operator std::size_t () const;
+    friend std::ostream & operator<<(std::ostream & os, A const & a);
+    friend std::istream & operator>>(std::istream & is, A & a);
+};
+
+//BOOST_TEST_DONT_PRINT_LOG_VALUE(A);
+
+template<class S>
+void randomize(S &x)
+{
+    assert(0 == x.size());
+    for(;;){
+        unsigned int i = std::rand() % 27;
+        if(0 == i)
+            break;
+        x += static_cast<BOOST_DEDUCED_TYPENAME S::value_type>('a' - 1 + i);
+    }
+}
+
+template<class T>
+void accumulate(std::size_t & s, const T & t){
+    const char * tptr = (const char *)(& t);
+    unsigned int count = sizeof(t);
+    while(count-- > 0){
+        s += *tptr++;
+    }
+}
+
+A::operator std::size_t () const {
+    std::size_t retval = 0;
+    accumulate(retval, b);
+    #ifndef BOOST_NO_INT64_T
+    accumulate(retval, f);
+    accumulate(retval, g);
+    #endif
+    accumulate(retval, l);
+    accumulate(retval, m);
+    accumulate(retval, n);
+    accumulate(retval, o);
+    accumulate(retval, p);
+    accumulate(retval, q);
+    #ifndef BOOST_NO_CWCHAR
+    accumulate(retval, r);
+    #endif
+    accumulate(retval, c);
+    accumulate(retval, s);
+    accumulate(retval, t);
+    accumulate(retval, u);
+    accumulate(retval, v);
+    return retval;
+}
+
+inline A::A() :
+    b(true),
+    #ifndef BOOST_NO_INT64_T
+    f(std::rand() * std::rand()),
+    g(std::rand() * std::rand()),
+    #endif
+    l(static_cast<enum h>(std::rand() % 3)),
+    m(std::rand()),
+    n(std::rand()),
+    o(std::rand()),
+    p(std::rand()),
+    q(std::rand()),
+    #ifndef BOOST_NO_CWCHAR
+    r(std::rand()),
+    #endif
+    c(std::rand()),
+    s(std::rand()),
+    t(std::rand()),
+    u(std::rand()),
+    v(std::rand()),
+    w((float)std::rand()),
+    x((double)std::rand())
+{
+    randomize(y);
+    #ifndef BOOST_NO_STD_WSTRING
+    randomize(z);
+    #endif
+}
+
+inline bool A::operator==(const A &rhs) const
+{
+    if(b != rhs.b)
+        return false;
+    if(l != rhs.l)
+        return false;
+    #ifndef BOOST_NO_INT64_T
+    if(f != rhs.f)
+        return false;
+    if(g != rhs.g)
+        return false;
+    #endif
+    if(m != rhs.m)
+        return false;
+    if(n != rhs.n)
+        return false;
+    if(o != rhs.o)
+        return false;
+    if(p != rhs.p)
+        return false; 
+    if(q != rhs.q)
+        return false;
+    #ifndef BOOST_NO_CWCHAR
+    if(r != rhs.r)
+        return false; 
+    #endif
+    if(c != rhs.c)
+        return false;
+    if(s != rhs.s)
+        return false;
+    if(t != rhs.t)
+        return false;
+    if(u != rhs.u)
+        return false; 
+    if(v != rhs.v)
+        return false; 
+    if(w == 0 && std::fabs(rhs.w) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(std::fabs(rhs.w/w - 1.0) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(x == 0 && std::fabs(rhs.x - x) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(std::fabs(rhs.x/x - 1.0) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(0 != y.compare(rhs.y))
+        return false;
+    #ifndef BOOST_NO_STD_WSTRING
+    if(0 != z.compare(rhs.z))
+        return false;
+    #endif      
+    return true;
+}
+
+inline bool A::operator!=(const A &rhs) const
+{
+    return ! (*this == rhs);
+}
+
+inline bool A::operator<(const A &rhs) const
+{
+    if(b != rhs.b)
+        return b < rhs.b;
+    #ifndef BOOST_NO_INT64_T
+    if(f != rhs.f)
+        return f < rhs.f;
+    if(g != rhs.g)
+        return g < rhs.g;
+    #endif
+    if(l != rhs.l )
+        return l < rhs.l;
+    if(m != rhs.m )
+        return m < rhs.m;
+    if(n != rhs.n )
+        return n < rhs.n;
+    if(o != rhs.o )
+        return o < rhs.o;
+    if(p != rhs.p )
+        return p < rhs.p;
+    if(q != rhs.q )
+        return q < rhs.q;
+    #ifndef BOOST_NO_CWCHAR
+    if(r != rhs.r )
+        return r < rhs.r;
+    #endif
+    if(c != rhs.c )
+        return c < rhs.c;
+    if(s != rhs.s )
+        return s < rhs.s;
+    if(t != rhs.t )
+        return t < rhs.t;
+    if(u != rhs.u )
+        return u < rhs.u; 
+    if(v != rhs.v )
+        return v < rhs.v;
+    if(w != rhs.w )
+        return w < rhs.w; 
+    if(x != rhs.x )
+        return x < rhs.x;
+    int i = y.compare(rhs.y);
+    if(i !=  0 )
+        return i < 0;
+    #ifndef BOOST_NO_STD_WSTRING
+    int j = z.compare(rhs.z);
+    if(j !=  0 )
+        return j < 0;
+    #endif
+    return false;
+}
+
+#endif // BOOST_SERIALIZATION_TEST_A_HPP

Added: branches/release/libs/serialization/example/demo_dll_b.hpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/demo_dll_b.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,112 @@
+#ifndef BOOST_SERIALIZATION_TEST_B_HPP
+#define BOOST_SERIALIZATION_TEST_B_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// B.hpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <cstdlib> // for rand()
+
+#include <boost/config.hpp>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+    using ::rand; 
+}
+#endif
+
+#include <boost/serialization/version.hpp>
+#include <boost/serialization/split_member.hpp>
+#include <boost/serialization/base_object.hpp>
+
+#include "A.hpp"
+
+///////////////////////////////////////////////////////
+// Derived class test
+class B : public A
+{
+private:
+    friend class boost::serialization::access;
+    template<class Archive>
+    void save(Archive &ar, const unsigned int /* file_version */) const
+    {
+        // write any base class info to the archive
+        ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(A);
+
+        // write out members
+        ar << BOOST_SERIALIZATION_NVP(s);
+        ar << BOOST_SERIALIZATION_NVP(t);
+        ar << BOOST_SERIALIZATION_NVP(u);
+        ar << BOOST_SERIALIZATION_NVP(v);
+        ar << BOOST_SERIALIZATION_NVP(w);
+        ar << BOOST_SERIALIZATION_NVP(x);
+    }
+
+    template<class Archive>
+    void load(Archive & ar, const unsigned int file_version)
+    {
+        // read any base class info to the archive
+        ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(A);
+        switch(file_version){
+        case 1:
+        case 2:
+            ar >> BOOST_SERIALIZATION_NVP(s);
+            ar >> BOOST_SERIALIZATION_NVP(t);
+            ar >> BOOST_SERIALIZATION_NVP(u);
+            ar >> BOOST_SERIALIZATION_NVP(v);
+            ar >> BOOST_SERIALIZATION_NVP(w);
+            ar >> BOOST_SERIALIZATION_NVP(x);
+        default:
+            break;
+        }
+    }
+
+    BOOST_SERIALIZATION_SPLIT_MEMBER()
+    signed char s;
+    unsigned char t;
+    signed int u;
+    unsigned int v;
+    float w;
+    double x;
+public:
+    B();
+    virtual ~B(){};
+    bool operator==(const B &rhs) const;
+};
+
+B::B() :
+    s(std::rand()),
+    t(std::rand()),
+    u(std::rand()),
+    v(std::rand()),
+    w((float)std::rand() / std::rand()),
+    x((double)std::rand() / std::rand())
+{
+}
+
+BOOST_CLASS_VERSION(B, 2)
+
+inline bool B::operator==(const B &rhs) const
+{
+    return
+        A::operator==(rhs)
+        && s == rhs.s 
+        && t == rhs.t 
+        && u == rhs.u 
+        && v == rhs.v 
+        && std::fabs(w - rhs.w) <= std::numeric_limits<float>::round_error()
+        && std::fabs(x - rhs.x) <= std::numeric_limits<float>::round_error()
+    ;
+}
+
+#endif // BOOST_SERIALIZATION_TEST_B_HPP

Added: branches/release/libs/serialization/example/demo_dll_b.ipp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/demo_dll_b.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,112 @@
+#ifndef BOOST_SERIALIZATION_TEST_B_HPP
+#define BOOST_SERIALIZATION_TEST_B_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// B.hpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <cstdlib> // for rand()
+
+#include <boost/config.hpp>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+    using ::rand; 
+}
+#endif
+
+#include <boost/serialization/version.hpp>
+#include <boost/serialization/split_member.hpp>
+#include <boost/serialization/base_object.hpp>
+
+#include "A.hpp"
+
+///////////////////////////////////////////////////////
+// Derived class test
+class B : public A
+{
+private:
+    friend class boost::serialization::access;
+    template<class Archive>
+    void save(Archive &ar, const unsigned int /* file_version */) const
+    {
+        // write any base class info to the archive
+        ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(A);
+
+        // write out members
+        ar << BOOST_SERIALIZATION_NVP(s);
+        ar << BOOST_SERIALIZATION_NVP(t);
+        ar << BOOST_SERIALIZATION_NVP(u);
+        ar << BOOST_SERIALIZATION_NVP(v);
+        ar << BOOST_SERIALIZATION_NVP(w);
+        ar << BOOST_SERIALIZATION_NVP(x);
+    }
+
+    template<class Archive>
+    void load(Archive & ar, const unsigned int file_version)
+    {
+        // read any base class info to the archive
+        ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(A);
+        switch(file_version){
+        case 1:
+        case 2:
+            ar >> BOOST_SERIALIZATION_NVP(s);
+            ar >> BOOST_SERIALIZATION_NVP(t);
+            ar >> BOOST_SERIALIZATION_NVP(u);
+            ar >> BOOST_SERIALIZATION_NVP(v);
+            ar >> BOOST_SERIALIZATION_NVP(w);
+            ar >> BOOST_SERIALIZATION_NVP(x);
+        default:
+            break;
+        }
+    }
+
+    BOOST_SERIALIZATION_SPLIT_MEMBER()
+    signed char s;
+    unsigned char t;
+    signed int u;
+    unsigned int v;
+    float w;
+    double x;
+public:
+    B();
+    virtual ~B(){};
+    bool operator==(const B &rhs) const;
+};
+
+B::B() :
+    s(std::rand()),
+    t(std::rand()),
+    u(std::rand()),
+    v(std::rand()),
+    w((float)std::rand() / std::rand()),
+    x((double)std::rand() / std::rand())
+{
+}
+
+BOOST_CLASS_VERSION(B, 2)
+
+inline bool B::operator==(const B &rhs) const
+{
+    return
+        A::operator==(rhs)
+        && s == rhs.s 
+        && t == rhs.t 
+        && u == rhs.u 
+        && v == rhs.v 
+        && std::fabs(w - rhs.w) <= std::numeric_limits<float>::round_error()
+        && std::fabs(x - rhs.x) <= std::numeric_limits<float>::round_error()
+    ;
+}
+
+#endif // BOOST_SERIALIZATION_TEST_B_HPP

Modified: branches/release/libs/serialization/example/demo_exception.cpp
==============================================================================
--- branches/release/libs/serialization/example/demo_exception.cpp	(original)
+++ branches/release/libs/serialization/example/demo_exception.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <iostream>
+#include <cstddef> // NULL
 #include <fstream>
 #include <string>
 

Modified: branches/release/libs/serialization/example/demo_gps.hpp
==============================================================================
--- branches/release/libs/serialization/example/demo_gps.hpp	(original)
+++ branches/release/libs/serialization/example/demo_gps.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -91,7 +91,7 @@
     virtual ~bus_stop(){}
 };
 
-BOOST_IS_ABSTRACT(bus_stop)
+BOOST_SERIALIZATION_ASSUME_ABSTRACT(bus_stop)
 
 std::ostream & operator<<(std::ostream &os, const bus_stop &bs)
 {

Modified: branches/release/libs/serialization/example/demo_portable_archive.cpp
==============================================================================
--- branches/release/libs/serialization/example/demo_portable_archive.cpp	(original)
+++ branches/release/libs/serialization/example/demo_portable_archive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -10,7 +10,6 @@
 // should pass compilation and execution
 #include <sstream>
 
-#define BOOST_ARCHIVE_SOURCE
 #include "portable_binary_oarchive.hpp"
 #include "portable_binary_iarchive.hpp"
 
@@ -20,30 +19,36 @@
 namespace std{ using ::rand; }
 #endif
 
-// the following is required to be sure the "EXPORT" works if it is used
-#define CUSTOM_ARCHIVE_TYPES portable_binary_oarchive,portable_binary_iarchive
-
 class A
 {
     friend class boost::serialization::access;
+    char c;
     int i;
+    int i2; // special tricky case to check sign extension
     unsigned int ui;
     long l;
     unsigned long ul;
     template<class Archive>
     void serialize(Archive & ar, const unsigned int /* version */){
-        ar & i & ui & l & ul ;
+        ar & c & i & i2 & ui & l & ul ;
     }
 public:
     bool operator==(const A & rhs) const {
         return
-            i == rhs.i && ui == rhs.ui && l == rhs.l && ul == rhs.ul
+            c == rhs.c
+            && i == rhs.i
+            && i2 == rhs.i2
+            && ui == rhs.ui 
+            && l == rhs.l 
+            && ul == rhs.ul
         ;
     }
     A() :
+        c(std::rand()),
         i(std::rand()),
+        i2(0x80),
         ui(std::rand()),
-        l(std::rand()),
+        l(std::rand() * std::rand()),
         ul(std::rand())
     {}
 };
@@ -62,6 +67,31 @@
         portable_binary_iarchive pbia(ss);
         pbia >> a1;
     }
+    if(! (a == a1))
+        return 1;
+
+    ss.clear();
+    {   
+        portable_binary_oarchive pboa(ss, endian_big);
+        pboa << a;
+    }
+    {
+        portable_binary_iarchive pbia(ss, endian_big);
+        pbia >> a1;
+    }
+    if(! (a == a1))
+        return 1;
+
+    ss.clear();
+    {   
+        portable_binary_oarchive pboa(ss, endian_big);
+        pboa << a;
+    }
+    {
+        portable_binary_iarchive pbia(ss, endian_big);
+        pbia >> a1;
+    }
+
     return !(a == a1);
 }
 

Modified: branches/release/libs/serialization/example/demo_shared_ptr.cpp
==============================================================================
--- branches/release/libs/serialization/example/demo_shared_ptr.cpp	(original)
+++ branches/release/libs/serialization/example/demo_shared_ptr.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -11,6 +11,7 @@
 
 #include <iomanip>
 #include <iostream>
+#include <cstddef> // NULL
 #include <fstream>
 #include <string>
 
@@ -41,8 +42,8 @@
     }
 public:
     static int count;
-    A::A(){++count;}    // default constructor
-    virtual A::~A(){--count;}   // default destructor
+    A(){++count;}    // default constructor
+    virtual ~A(){--count;}   // default destructor
 };
 
 BOOST_SERIALIZATION_SHARED_PTR(A)
@@ -60,8 +61,8 @@
     }
 public:
     static int count;
-    B::B() : A() {};
-    virtual B::~B() {};
+    B() : A() {};
+    virtual ~B() {};
 };
 
 BOOST_SERIALIZATION_SHARED_PTR(B)
@@ -81,7 +82,7 @@
     std::cout << "unique element count = " << A::count << std::endl;
 }
 
-int main(int argc, char *argv[])
+int main(int /* argc */, char /* *argv[] */)
 {
     std::string filename(boost::archive::tmpdir());
     filename += "/testfile";

Added: branches/release/libs/serialization/example/demo_xml.hpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/demo_xml.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,284 @@
+#ifndef BOOST_SERIALIZATION_EXAMPLE_DEMO_XML_HPP
+#define BOOST_SERIALIZATION_EXAMPLE_DEMO_XML_HPP
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+//
+// demo_xml.hpp
+//
+// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com .
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+
+#include <string>
+#include <iomanip>
+#include <iostream>
+#include <fstream>
+
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/utility.hpp>
+#include <boost/serialization/list.hpp>
+#include <boost/serialization/version.hpp>
+
+// This illustration models the bus system of a small city.
+// This includes, multiple bus stops,  bus routes and schedules.
+// There are different kinds of stops.  Bus stops in general will
+// will appear on multiple routes.  A schedule will include
+// muliple trips on the same route.
+
+/////////////////////////////////////////////////////////////
+// gps coordinate
+//
+// llustrates serialization for a simple type
+//
+class gps_position
+{
+    friend class boost::serialization::access;
+    friend std::ostream & operator<<(std::ostream &os, const gps_position &gp);
+
+    int degrees;
+    int minutes;
+    float seconds;
+
+    template<class Archive>
+    void serialize(Archive & ar, const unsigned int /* file_version */){
+        ar  & BOOST_SERIALIZATION_NVP(degrees)
+            & BOOST_SERIALIZATION_NVP(minutes)
+            & BOOST_SERIALIZATION_NVP(seconds);
+    }
+
+public:
+    // every serializable class needs a constructor
+    gps_position(){};
+    gps_position(int _d, int _m, float _s) : 
+        degrees(_d), minutes(_m), seconds(_s)
+    {}
+};
+
+std::ostream & operator<<(std::ostream &os, const gps_position &gp)
+{
+    return os << ' ' << gp.degrees << (unsigned char)186 << gp.minutes << '\'' << gp.seconds << '"';
+}
+
+/////////////////////////////////////////////////////////////
+// One bus stop
+//
+// illustrates serialization of serializable members
+//
+
+class bus_stop
+{
+    friend class boost::serialization::access;
+    virtual std::string description() const = 0;
+    gps_position latitude;
+    gps_position longitude;
+
+    template<class Archive>
+    void serialize(Archive &ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_NVP(latitude);
+        ar & BOOST_SERIALIZATION_NVP(longitude);
+    }
+
+protected:
+    bus_stop(const gps_position & _lat, const gps_position & _long) :
+        latitude(_lat), longitude(_long)
+    {}
+public:
+    bus_stop(){}
+    friend std::ostream & operator<<(std::ostream &os, const bus_stop &gp);
+    virtual ~bus_stop(){}
+};
+
+BOOST_IS_ABSTRACT(bus_stop)
+
+std::ostream & operator<<(std::ostream &os, const bus_stop &bs)
+{
+    return os << bs.latitude << bs.longitude << ' ' << bs.description();
+}
+
+/////////////////////////////////////////////////////////////
+// Several kinds of bus stops
+//
+// illustrates serialization of derived types
+//
+class bus_stop_corner : public bus_stop
+{
+    friend class boost::serialization::access;
+    std::string street1;
+    std::string street2;
+    virtual std::string description() const
+    {
+        return street1 + " and " + street2;
+    }
+    template<class Archive>
+    void serialize(Archive &ar, const unsigned int version)
+    {
+        // save/load base class information
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(bus_stop);
+        ar & BOOST_SERIALIZATION_NVP(street1);
+        ar & BOOST_SERIALIZATION_NVP(street2);
+    }
+public:
+    bus_stop_corner(){}
+    bus_stop_corner(const gps_position & _lat, const gps_position & _long,
+        const std::string & _s1, const std::string & _s2
+    ) :
+        bus_stop(_lat, _long), street1(_s1), street2(_s2)
+    {
+    }
+};
+
+class bus_stop_destination : public bus_stop
+{
+    friend class boost::serialization::access;
+    std::string name;
+    virtual std::string description() const
+    {
+        return name;
+    }
+    template<class Archive>
+    void serialize(Archive &ar, const unsigned int version)
+    {
+        ar  & BOOST_SERIALIZATION_BASE_OBJECT_NVP(bus_stop)
+            & BOOST_SERIALIZATION_NVP(name);
+    }
+public:
+    bus_stop_destination(){}
+    bus_stop_destination(
+        const gps_position & _lat, const gps_position & _long, const std::string & _name
+    ) :
+        bus_stop(_lat, _long), name(_name)
+    {
+    }
+};
+
+/////////////////////////////////////////////////////////////
+// a bus route is a collection of bus stops
+//
+// illustrates serialization of STL collection templates.
+//
+// illustrates serialzation of polymorphic pointer (bus stop *);
+//
+// illustrates storage and recovery of shared pointers is correct
+// and efficient.  That is objects pointed to by more than one
+// pointer are stored only once.  In such cases only one such
+// object is restored and pointers are restored to point to it
+//
+class bus_route
+{
+    friend class boost::serialization::access;
+    friend std::ostream & operator<<(std::ostream &os, const bus_route &br);
+    typedef bus_stop * bus_stop_pointer;
+    std::list<bus_stop_pointer> stops;
+    template<class Archive>
+    void serialize(Archive &ar, const unsigned int version)
+    {
+        // in this program, these classes are never serialized directly but rather
+        // through a pointer to the base class bus_stop. So we need a way to be
+        // sure that the archive contains information about these derived classes.
+        //ar.template register_type<bus_stop_corner>();
+        ar.register_type(static_cast<bus_stop_corner *>(NULL));
+        //ar.template register_type<bus_stop_destination>();
+        ar.register_type(static_cast<bus_stop_destination *>(NULL));
+        // serialization of stl collections is already defined
+        // in the header
+        ar & BOOST_SERIALIZATION_NVP(stops);
+    }
+public:
+    bus_route(){}
+    void append(bus_stop *_bs)
+    {
+        stops.insert(stops.end(), _bs);
+    }
+};
+std::ostream & operator<<(std::ostream &os, const bus_route &br)
+{
+    std::list<bus_stop *>::const_iterator it;
+    // note: we're displaying the pointer to permit verification
+    // that duplicated pointers are properly restored.
+    for(it = br.stops.begin(); it != br.stops.end(); it++){
+        os << '\n' << std::hex << "0x" << *it << std::dec << ' ' << **it;
+    }
+    return os;
+}
+
+/////////////////////////////////////////////////////////////
+// a bus schedule is a collection of routes each with a starting time
+//
+// Illustrates serialization of STL objects(pair) in a non-intrusive way.
+// See definition of operator<< <pair<F, S> >(ar, pair)
+// 
+// illustrates nesting of serializable classes
+//
+// illustrates use of version number to automatically grandfather older
+// versions of the same class.
+
+class bus_schedule
+{
+    friend class boost::serialization::access;
+    friend std::ostream & operator<<(std::ostream &os, const bus_schedule &bs);
+    template<class Archive>
+    void serialize(Archive &ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_NVP(schedule);
+    }
+    // note: this structure was made public. because the friend declarations
+    // didn't seem to work as expected.
+public:
+    struct trip_info
+    {
+        template<class Archive>
+        void serialize(Archive &ar, const unsigned int file_version)
+        {
+            // in versions 2 or later
+            if(file_version >= 2)
+                // read the drivers name
+                ar & BOOST_SERIALIZATION_NVP(driver);
+            // all versions have the follwing info
+            ar  & BOOST_SERIALIZATION_NVP(hour)
+                & BOOST_SERIALIZATION_NVP(minute);
+        }
+
+        // starting time
+        int hour;
+        int minute;
+        // only after system shipped was the driver's name added to the class
+        std::string driver;
+
+        trip_info(){}
+        trip_info(int _h, int _m, const std::string &_d) :
+            hour(_h), minute(_m), driver(_d)
+        {}
+        ~trip_info(){
+        }
+    };
+//  friend std::ostream & operator<<(std::ostream &os, const trip_info &ti);
+private:
+    std::list<std::pair<trip_info, bus_route *> > schedule;
+public:
+    void append(const std::string &_d, int _h, int _m, bus_route *_br)
+    {
+        schedule.insert(schedule.end(), std::make_pair(trip_info(_h, _m, _d), _br));
+    }
+    bus_schedule(){}
+};
+
+BOOST_CLASS_VERSION(bus_schedule::trip_info, 3)
+BOOST_CLASS_VERSION(bus_schedule, 2)
+
+std::ostream & operator<<(std::ostream &os, const bus_schedule::trip_info &ti)
+{
+    return os << '\n' << ti.hour << ':' << ti.minute << ' ' << ti.driver << ' ';
+}
+std::ostream & operator<<(std::ostream &os, const bus_schedule &bs)
+{
+    std::list<std::pair<bus_schedule::trip_info, bus_route *> >::const_iterator it;
+    for(it = bs.schedule.begin(); it != bs.schedule.end(); it++){
+        os << it->first << *(it->second);
+    }
+    return os;
+}
+
+#endif // BOOST_SERIALIZATION_EXAMPLE_DEMO_XML_HPP

Added: branches/release/libs/serialization/example/polymorphic_portable_binary_iarchive.cpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/polymorphic_portable_binary_iarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,34 @@
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// polymorphic_portable_binary_iarchive.cpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <istream>
+
+#define BOOST_ARCHIVE_SOURCE
+#include "polymorphic_portable_binary_iarchive.hpp"
+
+// explicitly instantiate for this type of text stream
+#include <boost/archive/impl/basic_binary_iarchive.ipp>
+#include <boost/archive/impl/archive_pointer_iserializer.ipp>
+#include <boost/archive/impl/basic_binary_iprimitive.ipp>
+
+namespace boost {
+namespace archive {
+
+template class binary_iarchive_impl<
+    polymorphic_portable_binary_iarchive, 
+    std::istream::char_type, 
+    std::istream::traits_type
+>;
+template class detail::archive_pointer_iserializer<
+    polymorphic_portable_binary_iarchive
+> ;
+
+} // namespace archive
+} // namespace boost

Added: branches/release/libs/serialization/example/polymorphic_portable_binary_iarchive.hpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/polymorphic_portable_binary_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,35 @@
+#ifndef BOOST_ARCHIVE_POLYMORPHIC_PORTABLE_BINARY_IARCHIVE_HPP
+#define BOOST_ARCHIVE_POLYMORPHIC_PORTABLE_BINARY_IARCHIVE_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// polymorphic_portable_binary_iarchive.hpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <boost/archive/detail/polymorphic_iarchive_dispatch.hpp>
+#include "portable_binary_iarchive.hpp"
+
+typedef boost::archive::detail::polymorphic_iarchive_dispatch<
+    portable_binary_iarchive
+> polymorphic_portable_binary_iarchive;
+
+#include <boost/version.hpp>
+#if BOOST_VERSION > 103401
+    // required by export
+    BOOST_SERIALIZATION_REGISTER_ARCHIVE(
+        polymorphic_portable_binary_iarchive
+    )
+#endif
+
+#endif // BOOST_ARCHIVE_POLYMORPHIC_PORTABLE_BINARY_OARCHIVE_HPP
+

Added: branches/release/libs/serialization/example/polymorphic_portable_binary_oarchive.cpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/polymorphic_portable_binary_oarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,35 @@
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// polymorphic_portable_binary_oarchive.cpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <ostream>
+
+#define BOOST_ARCHIVE_SOURCE
+#include "polymorphic_portable_binary_oarchive.hpp"
+
+// explicitly instantiate for this type of text stream
+#include <boost/archive/impl/basic_binary_oarchive.ipp>
+#include <boost/archive/impl/archive_pointer_oserializer.ipp>
+#include <boost/archive/impl/basic_binary_oprimitive.ipp>
+
+namespace boost {
+namespace archive {
+
+// explicitly instantiate for this type of binary stream
+template class binary_oarchive_impl<
+    polymorphic_portable_binary_oarchive, 
+    std::ostream::char_type, 
+    std::ostream::traits_type
+>;
+template class detail::archive_pointer_oserializer<
+    polymorphic_portable_binary_oarchive
+> ;
+
+} // namespace archive
+} // namespace boost

Added: branches/release/libs/serialization/example/polymorphic_portable_binary_oarchive.hpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/polymorphic_portable_binary_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,34 @@
+#ifndef BOOST_ARCHIVE_POLYMORPHIC_PORTABLE_BINARY_OARCHIVE_HPP
+#define BOOST_ARCHIVE_POLYMORPHIC_PORTABLE_BINARY_OARCHIVE_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// polymorphic_portable_binary_oarchive.hpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <boost/archive/detail/polymorphic_oarchive_dispatch.hpp>
+#include "portable_binary_oarchive.hpp"
+
+typedef boost::archive::detail::polymorphic_oarchive_dispatch<
+    portable_binary_oarchive
+ > polymorphic_portable_binary_oarchive;
+
+#include <boost/version.hpp>
+#if BOOST_VERSION > 103401
+    // required by export
+    BOOST_SERIALIZATION_REGISTER_ARCHIVE(
+        polymorphic_portable_binary_oarchive
+    )
+#endif
+
+#endif // BOOST_ARCHIVE_POLYMORPHIC_PORTABLE_BINARY_OARCHIVE_HPP

Added: branches/release/libs/serialization/example/portable_binary_archive.hpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/portable_binary_archive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,42 @@
+#ifndef PORTABLE_BINARY_ARCHIVE_HPP
+#define PORTABLE_BINARY_ARCHIVE_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/config.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/pfto.hpp>
+#include <boost/static_assert.hpp>
+
+#include <climits>
+#if CHAR_BIT != 8
+#error This code assumes an eight-bit byte.
+#endif
+
+#include <boost/archive/basic_archive.hpp>
+#include <boost/detail/endian.hpp>
+
+enum portable_binary_archive_flags {
+    endian_big        = 0x4000,
+    endian_little     = 0x8000
+};
+
+//#if ( endian_big <= boost::archive::flags_last )
+//#error archive flags conflict
+//#endif
+
+inline void
+reverse_bytes(char size, char *address){
+    char * first = address;
+    char * last = first + size - 1;
+    for(;first < last;++first, --last){
+        char x = *last;
+        *last = *first;
+        *first = x;
+    }
+}
+
+#endif // PORTABLE_BINARY_ARCHIVE_HPP

Added: branches/release/libs/serialization/example/portable_binary_iarchive.cpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/portable_binary_iarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,130 @@
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// portable_binary_iarchive.cpp
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <istream>
+#include <string>
+//#include <cstring> // memcpy
+
+#include <boost/detail/endian.hpp>
+#include <boost/throw_exception.hpp>
+#include <boost/archive/archive_exception.hpp>
+
+#include "portable_binary_iarchive.hpp"
+
+void 
+portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){
+    char size;
+    l = 0;
+    this->primitive_base_t::load(size);
+
+    if(0 == size){
+        return;
+    }
+
+    bool negative = (size < 0);
+    if(negative)
+        size = -size;
+
+    if(size > maxsize)
+        boost::throw_exception(
+            portable_binary_iarchive_exception()
+        );
+
+    char * cptr = reinterpret_cast<char *>(& l);
+    #ifdef BOOST_BIG_ENDIAN
+        cptr += (sizeof(boost::intmax_t) - size);
+    #endif
+    this->primitive_base_t::load_binary(cptr, size);
+
+    #ifdef BOOST_BIG_ENDIAN
+        if(m_flags & endian_little)
+    #else
+        if(m_flags & endian_big)
+    #endif
+            reverse_bytes(size, cptr);
+    
+    if(negative)
+        l = -l;
+}
+
+void
+portable_binary_iarchive::load_override(
+    boost::archive::class_name_type & t, int
+){
+    std::string cn;
+    cn.reserve(BOOST_SERIALIZATION_MAX_KEY_SIZE);
+    load_override(cn, 0);
+    if(cn.size() > (BOOST_SERIALIZATION_MAX_KEY_SIZE - 1))
+        boost::throw_exception(
+            boost::archive::archive_exception(
+                boost::archive::archive_exception::invalid_class_name)
+            );
+    std::memcpy(t, cn.data(), cn.size());
+    // borland tweak
+    t.t[cn.size()] = '\0';
+}
+
+void 
+portable_binary_iarchive::init(unsigned int flags){
+    if(0 == (flags & boost::archive::no_header)){
+        // read signature in an archive version independent manner
+        std::string file_signature;
+        * this >> file_signature;
+        if(file_signature != boost::archive::ARCHIVE_SIGNATURE())
+            boost::throw_exception(
+                boost::archive::archive_exception(
+                    boost::archive::archive_exception::invalid_signature
+                )
+            );
+        // make sure the version of the reading archive library can
+        // support the format of the archive being read
+        boost::archive::version_type input_library_version;
+        * this >> input_library_version;
+
+        // extra little .t is to get around borland quirk
+        if(boost::archive::ARCHIVE_VERSION() < input_library_version.t)
+            boost::throw_exception(
+                boost::archive::archive_exception(
+                    boost::archive::archive_exception::unsupported_version
+                )
+            );
+        
+        #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205))
+        this->set_library_version(input_library_version);
+        //#else
+        //#if ! BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
+        //detail::
+        //#endif
+        boost::archive::detail::basic_iarchive::set_library_version(
+            input_library_version
+        );
+        #endif
+    }
+    unsigned char x;
+    load(x);
+    m_flags = x << CHAR_BIT;
+}
+
+// explicitly instantiate for this 
+#include <boost/archive/impl/archive_pointer_iserializer.ipp>
+#include <boost/archive/impl/basic_binary_iprimitive.ipp>
+
+namespace boost {
+namespace archive {
+
+template class detail::archive_pointer_iserializer<portable_binary_iarchive> ;
+template class basic_binary_iprimitive<
+    portable_binary_iarchive,
+    std::istream::char_type, 
+    std::istream::traits_type
+> ;
+
+} // namespace archive
+} // namespace boost

Modified: branches/release/libs/serialization/example/portable_binary_iarchive.hpp
==============================================================================
--- branches/release/libs/serialization/example/portable_binary_iarchive.hpp	(original)
+++ branches/release/libs/serialization/example/portable_binary_iarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -6,31 +6,42 @@
 # pragma once
 #endif
 
+#if defined(_MSC_VER)
+#pragma warning( push )
+#pragma warning( disable : 4244 )
+#endif
+
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // portable_binary_iarchive.hpp
 
-// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// (C) Copyright 2002-7 Robert Ramey - http://www.rrsd.com . 
 // Use, modification and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <ostream>
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/detail/endian.hpp>
+#include <istream>
+#include <boost/serialization/string.hpp>
+#include <boost/archive/archive_exception.hpp>
+#include <boost/archive/basic_binary_iprimitive.hpp>
+#include <boost/archive/detail/common_iarchive.hpp>
+#include <boost/archive/shared_ptr_helper.hpp>
+#include <boost/archive/detail/register_archive.hpp>
+
+#include "portable_binary_archive.hpp"
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // exception to be thrown if integer read from archive doesn't fit
 // variable being loaded
-class portable_binary_archive_exception : 
+class portable_binary_iarchive_exception : 
     public virtual boost::archive::archive_exception
 {
 public:
     typedef enum {
         incompatible_integer_size 
     } exception_code;
-    portable_binary_archive_exception(exception_code c = incompatible_integer_size )
+    portable_binary_iarchive_exception(exception_code c = incompatible_integer_size )
     {}
     virtual const char *what( ) const throw( )
     {
@@ -46,128 +57,132 @@
 };
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// "Portable" input binary archive.  This is a variation of the native binary 
-// archive. it addresses integer size and endienness so that binary archives can
-// be passed across systems. Note:floating point types not addressed here
+// "Portable" input binary archive.  It addresses integer size and endienness so 
+// that binary archives can be passed across systems. Note:floating point types
+// not addressed here
 class portable_binary_iarchive :
-    // don't derive from binary_iarchive !!!
-    public boost::archive::binary_iarchive_impl<
-        portable_binary_iarchive, 
+    public boost::archive::basic_binary_iprimitive<
+        portable_binary_iarchive,
         std::istream::char_type, 
         std::istream::traits_type
     >,
+    public boost::archive::detail::common_iarchive<
+        portable_binary_iarchive
+    >
+	,
     public boost::archive::detail::shared_ptr_helper
-{
-    typedef boost::archive::binary_iarchive_impl<
-        portable_binary_iarchive, 
+	{
+    typedef boost::archive::basic_binary_iprimitive<
+        portable_binary_iarchive,
         std::istream::char_type, 
         std::istream::traits_type
-    > archive_base_t;
-    typedef boost::archive::basic_binary_iprimitive<
-        portable_binary_iarchive, 
-        std::ostream::char_type, 
-        std::ostream::traits_type
     > primitive_base_t;
+    typedef boost::archive::detail::common_iarchive<
+        portable_binary_iarchive
+    > archive_base_t;
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
     friend archive_base_t;
     friend primitive_base_t; // since with override load below
-    friend class boost::archive::basic_binary_iarchive<portable_binary_iarchive>;
+    friend class boost::archive::detail::interface_iarchive<
+        portable_binary_iarchive
+    >;
     friend class boost::archive::load_access;
+protected:
 #endif
-    void load_impl(long & l, char maxsize){
-        char size;
-        this->archive_base_t::load(size);
-        if(size > maxsize)
-            throw portable_binary_archive_exception() ;
-        l = 0;
-        load_binary(& l, size);
-        // we choose to use litle endian
-        #ifdef BOOST_BIG_ENDIAN
-            char * first = static_cast<char *>(static_cast<void *>(& l));
-            char * last = first + sizeof(l) - 1;
-            for(;first < last;++first, --last){
-                char x = *last;
-                *last = *first;
-                *first = x;
-            }
-        #endif
-
-        // extend sign if necessary
-        if((l >> (size - 1) * 8) & 0x80){
-            l |= (-1 << (size * 8));
-        }
-    }
+    unsigned int m_flags;
+    void load_impl(boost::intmax_t & l, char maxsize);
+
     // default fall through for any types not specified here
     template<class T>
     void load(T & t){
+        boost::intmax_t l;
+        load_impl(l, sizeof(T));
+        // use cast to avoid compile time warning
+        t = static_cast<T>(l);
+    }
+    void load(std::string & t){
+        this->primitive_base_t::load(t);
+    }
+    #ifndef BOOST_NO_STD_WSTRING
+    void load(std::wstring & t){
+        this->primitive_base_t::load(t);
+    }
+    #endif
+    void load(float & t){
         this->primitive_base_t::load(t);
+        // floats not supported
+        //BOOST_STATIC_ASSERT(false);
     }
-    void load(unsigned short & t){
-        long l;
-        load_impl(l, sizeof(unsigned short));
-        t = l;
-    }
-    void load(short & t){
-        long l;
-        load_impl(l, sizeof(short));
-        t = l;
-    }
-    void load(unsigned int & t){
-        long l;
-        load_impl(l, sizeof(unsigned int));
-        t = l;
-    }
-    void load(int & t){
-        long l;
-        load_impl(l, sizeof(int));
-        t = l;
-    }
-    void load(unsigned long & t){
-        long l;
-        load_impl(l, sizeof(unsigned long));
-        t = l;
-    }
-    void load(long & t){
-        long l;
-        load_impl(l, sizeof(long));
-        t = l;
+    void load(double & t){
+        this->primitive_base_t::load(t);
+        // doubles not supported
+        //BOOST_STATIC_ASSERT(false);
+    }
+    void load(char & t){
+        this->primitive_base_t::load(t);
+    }
+    void load(unsigned char & t){
+        this->primitive_base_t::load(t);
+    }
+    // intermediate level to support override of operators
+    // fot templates in the absence of partial function 
+    // template ordering
+    typedef boost::archive::detail::common_iarchive<portable_binary_iarchive> 
+        detail_common_iarchive;
+    template<class T>
+    void load_override(T & t, BOOST_PFTO int){
+        this->detail_common_iarchive::load_override(t, 0);
     }
+    void load_override(boost::archive::class_name_type & t, int);
+    // binary files don't include the optional information 
+    void load_override(
+        boost::archive::class_id_optional_type & /* t */, 
+        int
+    ){}
+
+    void init(unsigned int flags);
 public:
     portable_binary_iarchive(std::istream & is, unsigned flags = 0) :
-        archive_base_t(
-            is, 
-            flags | boost::archive::no_header // skip default header checking 
-        )
+        primitive_base_t(
+            * is.rdbuf(), 
+            0 != (flags & boost::archive::no_codecvt)
+        ),
+        archive_base_t(flags),
+        m_flags(0)
     {
-        // use our own header checking
-        if(0 != (flags & boost::archive::no_header)){
-            this->archive_base_t::init(flags);
-            // skip the following for "portable" binary archives
-            // boost::archive::basic_binary_oprimitive<derived_t, std::ostream>::init();
-        }
+        init(flags);
     }
-};
 
-// explicitly instantiate for this type of text stream
-#include <boost/archive/impl/basic_binary_iarchive.ipp>
-#include <boost/archive/impl/archive_pointer_iserializer.ipp>
-#include <boost/archive/impl/basic_binary_iprimitive.ipp>
-
-namespace boost {
-namespace archive {
-
-template class binary_iarchive_impl<
-    portable_binary_iarchive, 
-    std::istream::char_type, 
-    std::istream::traits_type
->;
-template class detail::archive_pointer_iserializer<portable_binary_iarchive> ;
+    portable_binary_iarchive(
+        std::basic_streambuf<
+            std::istream::char_type, 
+            std::istream::traits_type
+        > & bsb, 
+        unsigned int flags
+    ) :
+        primitive_base_t(
+            bsb, 
+            0 != (flags & boost::archive::no_codecvt)
+        ),
+        archive_base_t(flags),
+        m_flags(0)
+    {
+        init(flags);
+    }
+};
 
-} // namespace archive
-} // namespace boost
+// required by export in boost version > 1.34
+#ifdef BOOST_SERIALIZATION_REGISTER_ARCHIVE
+    BOOST_SERIALIZATION_REGISTER_ARCHIVE(portable_binary_iarchive)
+#endif
 
+// required by export in boost <= 1.34
 #define BOOST_ARCHIVE_CUSTOM_IARCHIVE_TYPES portable_binary_iarchive
 
+#if defined(_MSC_VER)
+#pragma warning( pop )
+#endif
+
 #endif // PORTABLE_BINARY_IARCHIVE_HPP

Added: branches/release/libs/serialization/example/portable_binary_oarchive.cpp
==============================================================================
--- (empty file)
+++ branches/release/libs/serialization/example/portable_binary_oarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -0,0 +1,96 @@
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// portable_binary_oarchive.cpp
+
+// (C) Copyright 2002-7 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <ostream>
+#include <boost/detail/endian.hpp>
+#include "portable_binary_oarchive.hpp"
+
+void 
+portable_binary_oarchive::save_impl(
+    const boost::intmax_t l,
+    const char maxsize
+){
+    char size = 0;
+
+    if(l == 0){
+        this->primitive_base_t::save(size);
+        return;
+    }
+
+    boost::intmax_t ll;
+    bool negative = (l < 0);
+    if(negative)
+        ll = -l;
+    else
+        ll = l;
+
+    do{
+        ll >>= CHAR_BIT;
+        ++size;
+    }while(ll != 0);
+
+    this->primitive_base_t::save(
+        static_cast<char>(negative ? -size : size)
+    );
+
+    if(negative)
+        ll = -l;
+    else
+        ll = l;
+    char * cptr = reinterpret_cast<char *>(& ll);
+    #ifdef BOOST_BIG_ENDIAN
+        cptr += (sizeof(boost::intmax_t) - size);
+        if(m_flags & endian_little)
+            reverse_bytes(size, cptr);
+    #else
+        if(m_flags & endian_big)
+            reverse_bytes(size, cptr);
+    #endif
+    this->primitive_base_t::save_binary(cptr, size);
+}
+
+void 
+portable_binary_oarchive::init(unsigned int flags) {
+    if(m_flags == (endian_big | endian_little)){
+        boost::throw_exception(
+            portable_binary_oarchive_exception()
+        );
+    }
+    if(0 == (flags & boost::archive::no_header)){
+        // write signature in an archive version independent manner
+        const std::string file_signature(
+            boost::archive::ARCHIVE_SIGNATURE()
+        );
+        * this << file_signature;
+        // write library version
+        const boost::archive::version_type v(
+            boost::archive::ARCHIVE_VERSION()
+        );
+        * this << v;
+    }
+    save(static_cast<unsigned char>(m_flags >> CHAR_BIT));
+}
+
+// explicitly instantiate for this type of stream
+#include <boost/archive/impl/archive_pointer_oserializer.ipp>
+#include <boost/archive/impl/basic_binary_oprimitive.ipp>
+
+namespace boost {
+namespace archive {
+
+template class detail::archive_pointer_oserializer<portable_binary_oarchive> ;
+template class basic_binary_oprimitive<
+    portable_binary_oarchive,
+    std::ostream::char_type, 
+    std::ostream::traits_type
+> ;
+
+} // namespace archive
+} // namespace boost

Modified: branches/release/libs/serialization/example/portable_binary_oarchive.hpp
==============================================================================
--- branches/release/libs/serialization/example/portable_binary_oarchive.hpp	(original)
+++ branches/release/libs/serialization/example/portable_binary_oarchive.hpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -6,6 +6,11 @@
 # pragma once
 #endif
 
+#if defined(_MSC_VER)
+#pragma warning( push )
+#pragma warning( disable : 4244 )
+#endif
+
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // portable_binary_oarchive.hpp
 
@@ -17,9 +22,38 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <ostream>
+#include <boost/serialization/string.hpp>
 #include <boost/archive/archive_exception.hpp>
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/detail/endian.hpp>
+#include <boost/archive/basic_binary_oprimitive.hpp>
+#include <boost/archive/detail/common_oarchive.hpp>
+#include <boost/archive/detail/register_archive.hpp>
+
+#include "portable_binary_archive.hpp"
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// exception to be thrown if integer read from archive doesn't fit
+// variable being loaded
+class portable_binary_oarchive_exception : 
+    public virtual boost::archive::archive_exception
+{
+public:
+    typedef enum {
+        invalid_flags 
+    } exception_code;
+    portable_binary_oarchive_exception(exception_code c = invalid_flags )
+    {}
+    virtual const char *what( ) const throw( )
+    {
+        const char *msg = "programmer error";
+        switch(code){
+        case invalid_flags:
+            msg = "cannot be both big and little endian";
+        default:
+            boost::archive::archive_exception::what();
+        }
+        return msg;
+    }
+};
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // "Portable" output binary archive.  This is a variation of the native binary 
@@ -27,65 +61,36 @@
 // be passed across systems. Note:floating point types not addressed here
 
 class portable_binary_oarchive :
-    // don't derive from binary_oarchive !!!
-    public boost::archive::binary_oarchive_impl<
-        portable_binary_oarchive, 
+    public boost::archive::basic_binary_oprimitive<
+        portable_binary_oarchive,
         std::ostream::char_type, 
         std::ostream::traits_type
+    >,
+    public boost::archive::detail::common_oarchive<
+        portable_binary_oarchive
     >
 {
-    typedef boost::archive::binary_oarchive_impl<
-        portable_binary_oarchive, 
-        std::ostream::char_type, 
-        std::ostream::traits_type
-    > archive_base_t;
     typedef boost::archive::basic_binary_oprimitive<
-        portable_binary_oarchive, 
+        portable_binary_oarchive,
         std::ostream::char_type, 
         std::ostream::traits_type
     > primitive_base_t;
+    typedef boost::archive::detail::common_oarchive<
+        portable_binary_oarchive
+    > archive_base_t;
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
     friend archive_base_t;
     friend primitive_base_t; // since with override save below
-    friend class boost::archive::basic_binary_oarchive<portable_binary_oarchive>;
+    friend class boost::archive::detail::interface_oarchive<
+        portable_binary_oarchive
+    >;
     friend class boost::archive::save_access;
+protected:
 #endif
-    void save_impl(long l){
-        long ll = l;
-        char size = 0;
-        if(l < 0){
-            // make sure that enough of data is output
-            // to include a high order bit indicating the sign
-            char x;
-            do{
-                x = ll;
-                ll >>= 8;
-                ++size;
-            }while(ll != -1 && x < 0);
-        }
-        else{
-            do{
-                ll >>= 8;
-                ++size;
-            }while(ll != 0);
-        }
-
-        this->archive_base_t::save(size);
-
-        // we choose to use litle endian
-        #ifdef BOOST_BIG_ENDIAN
-            char * first = static_cast<char *>(static_cast<void *>(& l));
-            char * last = first + sizeof(l) - 1;
-            for(;first < last;++first, --last){
-                char x = *last;
-                *last = *first;
-                *first = x;
-            }
-        #endif
-        save_binary(& l, size);
-    }
+    unsigned int m_flags;
+    void save_impl(const boost::intmax_t l, const char maxsize);
     // add base class to the places considered when matching
     // save function to a specific set of arguments.  Note, this didn't
     // work on my MSVC 7.0 system so we use the sure-fire method below
@@ -94,60 +99,94 @@
     // default fall through for any types not specified here
     template<class T>
     void save(const T & t){
+        save_impl(t, sizeof(T));
+    }
+    void save(const std::string & t){
         this->primitive_base_t::save(t);
     }
-    void save(const short  t){
-        save_impl(t);
+    #ifndef BOOST_NO_STD_WSTRING
+    void save(const std::wstring & t){
+        this->primitive_base_t::save(t);
     }
-    void save(const unsigned short t){
-        save_impl(t);
+    #endif
+    void save(const float & t){
+        this->primitive_base_t::save(t);
+        // floats not supported
+        //BOOST_STATIC_ASSERT(false);
     }
-    void save(const unsigned int t){
-        save_impl(t);
+    void save(const double & t){
+        this->primitive_base_t::save(t);
+        // doubles not supported
+        //BOOST_STATIC_ASSERT(false);
     }
-    void save(const int t){
-        save_impl(t);
+    void save(const char & t){
+        this->primitive_base_t::save(t);
     }
-    void save(const unsigned long t){
-        save_impl(t);
+    void save(const unsigned char & t){
+        this->primitive_base_t::save(t);
     }
-    void save(const long t){
-        save_impl(t);
+
+    // default processing - kick back to base class.  Note the
+    // extra stuff to get it passed borland compilers
+    typedef boost::archive::detail::common_oarchive<portable_binary_oarchive> 
+        detail_common_oarchive;
+    template<class T>
+    void save_override(T & t, BOOST_PFTO int){
+        this->detail_common_oarchive::save_override(t, 0);
     }
+    // explicitly convert to char * to avoid compile ambiguities
+    void save_override(const boost::archive::class_name_type & t, int){
+        const std::string s(t);
+        * this << s;
+    }
+    // binary files don't include the optional information 
+    void save_override(
+        const boost::archive::class_id_optional_type & /* t */, 
+        int
+    ){}
+
+    void init(unsigned int flags);
 public:
     portable_binary_oarchive(std::ostream & os, unsigned flags = 0) :
-        archive_base_t(
-            os, 
-            flags | boost::archive::no_header // skip default header checking 
-        )
+        primitive_base_t(
+            * os.rdbuf(),
+            0 != (flags & boost::archive::no_codecvt)
+        ),
+        archive_base_t(flags),
+        m_flags(flags & (endian_big | endian_little))
     {
-        // use our own header checking
-        if(0 != (flags & boost::archive::no_header)){
-            this->archive_base_t::init(flags);
-            // skip the following for "portable" binary archives
-            // boost::archive::basic_binary_iprimitive<derived_t, std::ostream>::init();
-        }
+        init(flags);
+    }
+
+    portable_binary_oarchive(
+        std::basic_streambuf<
+            std::ostream::char_type, 
+            std::ostream::traits_type
+        > & bsb, 
+        unsigned int flags
+    ) :
+        primitive_base_t(
+            bsb, 
+            0 != (flags & boost::archive::no_codecvt)
+        ),
+        archive_base_t(flags),
+        m_flags(0)
+    {
+        init(flags);
     }
 };
 
-#include <boost/archive/impl/basic_binary_oarchive.ipp>
-#include <boost/archive/impl/archive_pointer_oserializer.ipp>
-#include <boost/archive/impl/basic_binary_oprimitive.ipp>
-
-namespace boost {
-namespace archive {
-
-// explicitly instantiate for this type of binary stream
-template class binary_oarchive_impl<
-    portable_binary_oarchive, 
-    std::ostream::char_type, 
-    std::ostream::traits_type
->;
-template class detail::archive_pointer_oserializer<portable_binary_oarchive> ;
 
-} // namespace archive
-} // namespace boost
+// required by export in boost version > 1.34
+#ifdef BOOST_SERIALIZATION_REGISTER_ARCHIVE
+    BOOST_SERIALIZATION_REGISTER_ARCHIVE(portable_binary_oarchive)
+#endif
 
+// required by export in boost <= 1.34
 #define BOOST_ARCHIVE_CUSTOM_OARCHIVE_TYPES portable_binary_oarchive
 
+#if defined(_MSC_VER)
+#pragma warning( pop )
+#endif
+
 #endif // PORTABLE_BINARY_OARCHIVE_HPP

Modified: branches/release/libs/serialization/src/basic_archive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_archive.cpp	(original)
+++ branches/release/libs/serialization/src/basic_archive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -17,7 +17,7 @@
 //      [
 //          exported key - class name*
 //          tracking level - always/never
-//          file version
+//          class version
 //      ]
 //
 //      if tracking

Modified: branches/release/libs/serialization/src/basic_iarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_iarchive.cpp	(original)
+++ branches/release/libs/serialization/src/basic_iarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -14,7 +14,7 @@
 #include <set>
 #include <list>
 #include <vector>
-#include <cstddef> // size_t
+#include <cstddef> // size_t, NULL
 
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
@@ -23,20 +23,23 @@
 } // namespace std
 #endif
 
-#define BOOST_ARCHIVE_SOURCE
-#include <boost/archive/detail/auto_link_archive.hpp>
-
 #include <boost/limits.hpp>
 #include <boost/state_saver.hpp>
 #include <boost/throw_exception.hpp>
+#include <boost/serialization/tracking.hpp>
+
+#include <boost/archive/archive_exception.hpp>
 
+#define BOOST_ARCHIVE_SOURCE
+#define BOOST_SERIALIZATION_SOURCE
+
+#include <boost/archive/detail/decl.hpp>
+#include <boost/archive/basic_archive.hpp>
 #include <boost/archive/detail/basic_iserializer.hpp>
 #include <boost/archive/detail/basic_pointer_iserializer.hpp>
 #include <boost/archive/detail/basic_iarchive.hpp>
-#include <boost/archive/archive_exception.hpp>
 
-#include <boost/serialization/tracking.hpp>
-#include <boost/serialization/extended_type_info.hpp>
+#include <boost/archive/detail/auto_link_archive.hpp>
 
 using namespace boost::serialization;
 
@@ -44,9 +47,6 @@
 namespace archive {
 namespace detail {
 
-class basic_iserializer;
-class basic_pointer_iserializer;
-
 class basic_iarchive_impl {
     friend class basic_iarchive;
     version_type m_archive_library_version;
@@ -166,6 +166,7 @@
         m_flags(flags),
         moveable_objects_start(0),
         moveable_objects_end(0),
+        moveable_objects_recent(0),
         pending_object(NULL),
         pending_bis(NULL),
         pending_version(0)
@@ -223,7 +224,6 @@
     const void * new_address, 
     const void *old_address
 ){
-    object_id_type i;
     // this code handles a couple of situations.
     // a) where reset_object_address is applied to an untracked object.
     //    In such a case the call is really superfluous and its really an
@@ -236,6 +236,7 @@
     //    but the code may work anyway.  Naturally, a bad practice on the part
     //    of the programmer but we can't detect it - as above.  So maybe we
     //    can save a few more people from themselves as above.
+    object_id_type i;
     for(i = moveable_objects_recent; i < moveable_objects_end; ++i){
         if(old_address == object_id_vector[i].address)
             break;
@@ -274,8 +275,10 @@
         ++i
     ){
         if(i->loaded_as_pointer){
-            const unsigned int j = i->class_id;
+            // borland complains without this minor hack
+            const int j = i->class_id;
             const cobject_id & co = cobject_id_vector[j];
+            //const cobject_id & co = cobject_id_vector[i->class_id];
             // with the appropriate input serializer, 
             // delete the indicated object
             co.bis_ptr->destroy(i->address);
@@ -358,7 +361,8 @@
     }
 
     const class_id_type cid = register_type(bis);
-    cobject_id & co = cobject_id_vector[cid];
+    const int i = cid;
+    cobject_id & co = cobject_id_vector[i];
 
     load_preamble(ar, co);
 
@@ -482,8 +486,15 @@
     return bpis_ptr;
 }
 
+} // namespace detail
+} // namespace archive
+} // namespace boost
+
 //////////////////////////////////////////////////////////////////////
 // implementation of basic_iarchive functions
+namespace boost {
+namespace archive {
+namespace detail {
 
 BOOST_ARCHIVE_DECL(void)
 basic_iarchive::next_object_pointer(void *t){

Modified: branches/release/libs/serialization/src/basic_iserializer.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_iserializer.cpp	(original)
+++ branches/release/libs/serialization/src/basic_iserializer.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,6 +8,8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
+
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/detail/basic_iserializer.hpp>
 
@@ -20,7 +22,7 @@
     const boost::serialization::extended_type_info & eti
 ) :
     basic_serializer(eti), 
-    bpis(NULL)
+    m_bpis(NULL)
 {}
 
 BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 

Modified: branches/release/libs/serialization/src/basic_oarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_oarchive.cpp	(original)
+++ branches/release/libs/serialization/src/basic_oarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -12,6 +12,7 @@
 
 #include <cassert>
 #include <set>
+#include <cstddef> // NULL
 
 #include <boost/limits.hpp>
 #include <boost/state_saver.hpp>
@@ -20,12 +21,14 @@
 // including this here to work around an ICC in intel 7.0
 // normally this would be part of basic_oarchive.hpp below.
 #define BOOST_ARCHIVE_SOURCE
-#include <boost/archive/basic_archive.hpp>
+#define BOOST_SERIALIZATION_SOURCE
 
+#include <boost/archive/basic_archive.hpp>
 #include <boost/archive/detail/basic_oserializer.hpp>
 #include <boost/archive/detail/basic_pointer_oserializer.hpp>
 #include <boost/archive/detail/basic_oarchive.hpp>
 #include <boost/archive/archive_exception.hpp>
+#include <boost/serialization/extended_type_info.hpp>
 
 #ifdef BOOST_MSVC
 #  pragma warning(push)
@@ -35,9 +38,6 @@
 using namespace boost::serialization;
 
 namespace boost {
-namespace serialization {
-    class extended_type_info;
-}
 namespace archive {
 namespace detail {
 
@@ -164,7 +164,7 @@
 };
 
 //////////////////////////////////////////////////////////////////////
-// implementation of basic_oarchive implementation functions
+// basic_oarchive implementation functions
 
 // given a type_info - find its bos
 // return NULL if not found
@@ -385,9 +385,17 @@
     stored_pointers.insert(oid);
 }
 
+} // namespace detail
+} // namespace archive
+} // namespace boost
+
 //////////////////////////////////////////////////////////////////////
 // implementation of basic_oarchive functions
 
+namespace boost {
+namespace archive {
+namespace detail {
+
 BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
 basic_oarchive::basic_oarchive(unsigned int flags)
     : pimpl(new basic_oarchive_impl(flags))

Modified: branches/release/libs/serialization/src/basic_oserializer.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_oserializer.cpp	(original)
+++ branches/release/libs/serialization/src/basic_oserializer.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -8,6 +8,8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
+
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/detail/basic_oserializer.hpp>
 
@@ -20,7 +22,7 @@
         const boost::serialization::extended_type_info & eti
 ) :
     basic_serializer(eti), 
-    bpos(NULL)
+    m_bpos(NULL)
 {}
 
 BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 

Modified: branches/release/libs/serialization/src/basic_serializer_map.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_serializer_map.cpp	(original)
+++ branches/release/libs/serialization/src/basic_serializer_map.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -14,8 +14,6 @@
 
 #include <stdlib.h> // for NULL
 
-#include <set>
-
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/detail/basic_serializer.hpp>
 #include <boost/archive/detail/basic_serializer_map.hpp>
@@ -27,6 +25,7 @@
 namespace archive {
 namespace detail {
 
+#if 0
 BOOST_ARCHIVE_DECL(bool) 
 type_info_pointer_compare::operator()(
     const basic_serializer * lhs, const basic_serializer * rhs
@@ -34,6 +33,19 @@
     return *lhs < *rhs;
 }
 
+class basic_serializer_arg : public basic_serializer {
+public:
+    basic_serializer_arg(const serialization::extended_type_info & eti) :
+        basic_serializer(eti)
+    {}
+};
+#endif
+
+} // namespace detail
+} // namespace archive
+} // namespace boost
+
+#if 0
 BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
 basic_serializer_map::basic_serializer_map(bool & deleted) :
     m_deleted(deleted)
@@ -41,6 +53,19 @@
     m_deleted = false;
 }
 
+BOOST_ARCHIVE_DECL(const basic_serializer *) 
+basic_serializer_map::tfind(
+    const boost::serialization::extended_type_info & eti
+) const {
+    const basic_serializer_arg bs(eti);
+    map_type::const_iterator it;
+    boost::serialization::singleton<basic_serializer_map>::lease l;
+    it = l->m_map.find(& bs);
+    if(it == l->m_map.end())
+        return NULL;
+    return *it;
+}
+
 BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
 basic_serializer_map::~basic_serializer_map(){
     m_deleted = true;
@@ -48,33 +73,13 @@
 
 BOOST_ARCHIVE_DECL(bool) 
 basic_serializer_map::insert(const basic_serializer * bs){
-    return m_map.insert(bs).second;
+    boost::serialization::singleton<basic_serializer_map>::lease l;
+    return l->m_map.insert(bs).second;
 }
 
 BOOST_ARCHIVE_DECL(void) 
 basic_serializer_map::erase(basic_serializer * bs){
-    m_map.erase(bs);
+    boost::serialization::singleton<basic_serializer_map>::lease l;
+    l->m_map.erase(bs);
 }
-
-class basic_serializer_arg : public basic_serializer {
-public:
-    basic_serializer_arg(const serialization::extended_type_info & eti) :
-        basic_serializer(eti)
-    {}
-};
-
-BOOST_ARCHIVE_DECL(const basic_serializer *) 
-basic_serializer_map::tfind(
-    const boost::serialization::extended_type_info & eti
-) const {
-    const basic_serializer_arg bs(eti);
-    map_type::const_iterator it;
-    it = m_map.find(& bs);
-    if(it == m_map.end())
-        return NULL;
-    return *it;
-}
-
-} // namespace detail
-} // namespace archive
-} // namespace boost
+#endif

Modified: branches/release/libs/serialization/src/basic_xml_grammar.ipp
==============================================================================
--- branches/release/libs/serialization/src/basic_xml_grammar.ipp	(original)
+++ branches/release/libs/serialization/src/basic_xml_grammar.ipp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -29,6 +29,7 @@
 #include <boost/io/ios_state.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/archive/impl/basic_xml_grammar.hpp>
+#include <boost/archive/xml_archive_exception.hpp>
 #include <boost/archive/basic_xml_archive.hpp>
 #include <boost/archive/iterators/xml_unescape.hpp>
 
@@ -128,7 +129,7 @@
 struct append_char {
     String & contents;
     void operator()(const unsigned int char_value) const {
-        const typename String::value_type z = char_value;
+        const BOOST_DEDUCED_TYPENAME String::value_type z = char_value;
         contents += z;
     }
     append_char(String & contents_)
@@ -141,7 +142,7 @@
     String & contents;
     template<class X, class Y>
     void operator()(const X & /*x*/, const Y & /*y*/) const {
-        const typename String::value_type z = c;
+        const BOOST_DEDUCED_TYPENAME String::value_type z = c;
         contents += z;
     }
     append_lit(String & contents_)
@@ -269,7 +270,7 @@
     ;
 
     // refactoring to workaround template depth on darwin
-    CharDataChars = *(anychar_p - chset_p(L"&<"));
+    CharDataChars = +(anychar_p - chset_p(L"&<"));
     CharData =  
         CharDataChars [
             xml::append_string<
@@ -305,7 +306,7 @@
 
     content = 
         L"<" // should be end_p
-        | (Reference | CharData) >> content
+        | +(Reference | CharData) >> L"<"
     ;
 
     ClassIDAttribute = 
@@ -368,7 +369,7 @@
         Name
         >> Eq
         >> L'"'
-        >> CharData
+        >> !CharData
         >> L'"'
     ;
 

Modified: branches/release/libs/serialization/src/binary_iarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/binary_iarchive.cpp	(original)
+++ branches/release/libs/serialization/src/binary_iarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -23,28 +23,28 @@
 // explicitly instantiate for this type of stream
 template class basic_binary_iprimitive<
     naked_binary_iarchive,
-    char, 
-    std::char_traits<char> 
+    std::istream::char_type, 
+    std::istream::traits_type
 >;
 template class basic_binary_iarchive<naked_binary_iarchive> ;
 template class binary_iarchive_impl<
     naked_binary_iarchive, 
-    char, 
-    std::char_traits<char> 
+    std::istream::char_type, 
+    std::istream::traits_type
 >;
 template class detail::archive_pointer_iserializer<naked_binary_iarchive> ;
 
 // explicitly instantiate for this type of stream
 template class basic_binary_iprimitive<
     binary_iarchive,
-    char, 
-    std::char_traits<char> 
+    std::istream::char_type, 
+    std::istream::traits_type
 >;
 template class basic_binary_iarchive<binary_iarchive> ;
 template class binary_iarchive_impl<
     binary_iarchive, 
-    char, 
-    std::char_traits<char> 
+    std::istream::char_type, 
+    std::istream::traits_type
 >;
 template class detail::archive_pointer_iserializer<binary_iarchive> ;
 

Modified: branches/release/libs/serialization/src/binary_oarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/binary_oarchive.cpp	(original)
+++ branches/release/libs/serialization/src/binary_oarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -23,14 +23,14 @@
 // explicitly instantiate for this type of binary stream
 template class basic_binary_oprimitive<
     binary_oarchive, 
-    char, 
-    std::char_traits<char> 
+    std::ostream::char_type, 
+    std::ostream::traits_type
 >;
 template class basic_binary_oarchive<binary_oarchive> ;
 template class binary_oarchive_impl<
     binary_oarchive, 
-    char, 
-    std::char_traits<char> 
+    std::ostream::char_type, 
+    std::ostream::traits_type
 >;
 template class detail::archive_pointer_oserializer<binary_oarchive> ;
 

Modified: branches/release/libs/serialization/src/codecvt_null.cpp
==============================================================================
--- branches/release/libs/serialization/src/codecvt_null.cpp	(original)
+++ branches/release/libs/serialization/src/codecvt_null.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -1,13 +1,13 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // codecvt_null.cpp
 
-// Copyright © 2004 Robert Ramey, Indiana University (garcia_at_[hidden])
+// Copyright (c) 2004 Robert Ramey, Indiana University (garcia_at_[hidden])
 // Andrew Lumsdaine, Indiana University (lums_at_[hidden]). 
 // Use, modification and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_ARCHIVE_SOURCE
+#define BOOST_WARCHIVE_SOURCE
 #include <boost/archive/codecvt_null.hpp>
 
 // codecvt implementation for passing wchar_t objects to char output
@@ -17,9 +17,9 @@
 namespace boost {
 namespace archive {
 
-std::codecvt_base::result 
+BOOST_WARCHIVE_DECL(std::codecvt_base::result)
 codecvt_null<wchar_t>::do_out(
-    std::mbstate_t & state,
+    std::mbstate_t & /*state*/,
     const wchar_t * first1, 
     const wchar_t * last1,
     const wchar_t * & next1,
@@ -45,7 +45,7 @@
     return std::codecvt_base::ok;
 }
 
-std::codecvt_base::result 
+BOOST_WARCHIVE_DECL(std::codecvt_base::result)
 codecvt_null<wchar_t>::do_in(
     std::mbstate_t & state,
     const char * first1, 

Modified: branches/release/libs/serialization/src/extended_type_info.cpp
==============================================================================
--- branches/release/libs/serialization/src/extended_type_info.cpp	(original)
+++ branches/release/libs/serialization/src/extended_type_info.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -14,7 +14,9 @@
 
 #include <algorithm>
 #include <set>
+#include <utility>
 #include <cassert>
+#include <cstddef> // NULL
 
 #include <boost/config.hpp> // msvc needs this to suppress warning
 
@@ -24,271 +26,131 @@
 #endif
 
 #include <boost/detail/no_exceptions_support.hpp>
+#include <boost/serialization/singleton.hpp>
+#include <boost/serialization/force_include.hpp>
+
 #define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/extended_type_info.hpp>
 
 namespace boost { 
 namespace serialization {
-
-// remove all registrations corresponding to a given type
-void unregister_void_casts(extended_type_info *eti);
-
 namespace detail {
 
-// it turns out that at least one compiler (msvc 6.0) doesn't guarentee
-// to destroy static objects in exactly the reverse sequence that they
-// are constructed.  To guarentee this, use a singleton pattern
-
-// map for finding the unique global extended type entry for a given type
-class tkmap {
-    struct type_info_compare
-    {
-        bool
-        operator()(const extended_type_info * lhs, const extended_type_info * rhs) const
-        {
-            assert(! lhs->is_destructing());
-            assert(! rhs->is_destructing());
-            return *lhs < *rhs;
-        }
-    };
-    typedef std::multiset<const extended_type_info *, type_info_compare> type;
-    //typedef std::set<const extended_type_info *, type_info_compare> type;
-    type m_map;
-    static tkmap * m_self;
-    tkmap(){}
-    static tkmap::type::iterator
-    lookup(const extended_type_info * eti){
-        return m_self->m_map.find(eti);
-    }
-public:
-    ~tkmap(){
-        m_self = NULL;
-    }
-    static void
-    insert(const extended_type_info * eti){
-        if(NULL == m_self){
-            static tkmap instance;
-            m_self = & instance;
-        }
-        // make sure that attempt at registration is done only once
-        assert(lookup(eti) == m_self->m_map.end());
-        m_self->m_map.insert(eti);
-    }
-    static const extended_type_info * 
-    find(const extended_type_info * eti){
-        if(NULL == m_self)
-            return NULL;
-        tkmap::type::const_iterator it;
-        it = m_self->m_map.find(eti);
-        if(it == m_self->m_map.end())
-            return NULL;
-        return *it;
-    }
-    static void 
-    purge(const extended_type_info * eti){
-        if(NULL == m_self)
-            return;
-        // note: the following can't be used as this function
-        // is called from a destructor of extended_type_info.
-        // This will generate an error on some machines - which
-        // makes sense be cause by this time the derived class data
-        // might be gone.  Leave this in as a reminder not to do this
-        #if 0
-        tkmap::type::iterator it;
-        it = lookup(eti);
-        // it should be in there
-        assert(it != m_self->m_map.end());
-        m_self->m_map.erase(it);
-        #endif
-
-        tkmap::type::iterator i = m_self->m_map.begin();
-        tkmap::type::iterator k = m_self->m_map.end();
-        while(i != k){
-            // note that the erase might invalidate i so save it here
-            tkmap::type::iterator j = i++;
-            if(*j == eti)
-                m_self->m_map.erase(j);
-        }
+struct key_compare
+{
+    bool
+    operator()(
+        const extended_type_info * lhs, 
+        const extended_type_info * rhs
+    ) const {
+        const char * l = lhs->get_key();
+        assert(NULL != l);
+        const char * r = rhs->get_key();
+        assert(NULL != r);
+        // performance shortcut
+        // shortcut to exploit string pooling
+        if(l == r)
+            return false;
+        // for exported types, use the string key so that
+        // multiple instances in different translation units
+        // can be matched up
+        return std::strcmp(l, r) < 0;
     }
 };
 
-tkmap * tkmap::m_self = NULL;
-
-// map for finding the unique global extended type info entry given its GUID
-class ktmap {
-    struct key_compare
-    {
-        bool
-        operator()(const extended_type_info * lhs, const extended_type_info * rhs) const
-        {
-            // shortcut to exploit string pooling
-            if(lhs->get_key() == rhs->get_key())
-                return false;
-            if(NULL == lhs->get_key())
-                return true;
-            if(NULL == rhs->get_key())
-                return false;
-            return std::strcmp(lhs->get_key(), rhs->get_key()) < 0; 
-        }
-    };
-    typedef std::multiset<const extended_type_info *, key_compare> type;
-    //typedef std::set<const extended_type_info *, key_compare> type;
-    type m_map;
-    static ktmap * m_self;
-    ktmap(){}
-    class extended_type_info_arg : public extended_type_info
-    {
-    public:
-        extended_type_info_arg(const char * key) :
-            extended_type_info(NULL)
-        {
-            m_key = key;
-        }
-        virtual bool
-        less_than(const extended_type_info &rhs) const
-        {
-            assert(false);
-            return false;   // to prevent a syntax error
-        }
-    };
-    static ktmap::type::iterator
-    lookup(const char *key){
-        extended_type_info_arg arg(key);
-        return m_self->m_map.find(&arg);
-    }
+typedef std::multiset<const extended_type_info *, key_compare> ktmap;
 
+class extended_type_info_arg : public extended_type_info
+{
 public:
-    ~ktmap(){
-        m_self = NULL;
-    }
-    static void
-    insert(const extended_type_info * eti){
-        if(NULL == m_self){
-            static ktmap instance;
-            m_self = & instance;
-        }
-        // make sure that all GUIDs are unique
-        assert(lookup(eti->get_key()) == m_self->m_map.end());
-        m_self->m_map.insert(eti);
-    }
-    static const extended_type_info * 
-    find(const char *key)
+    extended_type_info_arg(const char * key) :
+        extended_type_info(NULL)
     {
-        if(NULL == m_self)
-            return NULL;
-        extended_type_info_arg arg(key);
-        ktmap::type::const_iterator it;
-        it = m_self->m_map.find(&arg);
-        if(it == m_self->m_map.end())
-            return NULL;
-        return *it;
+        m_key = key;
     }
-    static void 
-    purge(const extended_type_info * eti){
-        if(NULL == m_self)
-            return;
-        // note: the following can't be used as this function
-        // is called from a destructor of extended_type_info.
-        // This will generate an error on some machines - which
-        // makes sense be cause by this time the derived class data
-        // might be gone.  Leave this in as a reminder not to do this
-        #if 0
-        ktmap::type::iterator it;
-        it = lookup(eti->get_key());
-        // expect it to be in there !
-        assert(it != m_self->m_map.end());
-        m_self->m_map.erase(it);
-        #endif
-
-        ktmap::type::iterator i = m_self->m_map.begin();
-        ktmap::type::iterator k = m_self->m_map.end();
-        while(i != k){
-            // note that the erase might invalidate i so save it here
-            ktmap::type::iterator j = i++;
-            if(*j == eti)
-                m_self->m_map.erase(j);
-        }
+    ~extended_type_info_arg(){
+        m_key = NULL;
     }
 };
 
-ktmap * ktmap::m_self = NULL;
-
 } // namespace detail
 
-BOOST_SERIALIZATION_DECL(const extended_type_info *) 
-extended_type_info::find(const char *key)
-{
-    return detail::ktmap::find(key);
+BOOST_SERIALIZATION_DECL(void)  
+extended_type_info::key_register(const char *key) {
+    assert(NULL != key);
+    m_key = key;
+    singleton<detail::ktmap>::get_mutable_instance().insert(this);
 }
 
-BOOST_SERIALIZATION_DECL(void) 
-extended_type_info::self_register()
-{
-    detail::tkmap::insert(this);
-    m_self_registered = true;
+BOOST_SERIALIZATION_DECL(void)  
+extended_type_info::key_unregister() {
+    assert(NULL != m_key);
+    detail::ktmap & x = singleton<detail::ktmap>::get_mutable_instance();
+    detail::ktmap::iterator start = x.lower_bound(this);
+    detail::ktmap::iterator end = x.upper_bound(this);
+    assert(start != end);
+
+    // remove entry in map which corresponds to this type
+    do{
+        if(this == *start){
+            x.erase(start);
+            break;
+        }
+    }while(++start != end);
+
+    m_key = NULL;
 }
 
-BOOST_SERIALIZATION_DECL(void)  
-extended_type_info::key_register(const char *key_) {
-    if(NULL == key_)
-        return;
-    m_key = key_;
-    detail::ktmap::insert(this);
-    m_key_registered = true;
+BOOST_SERIALIZATION_DECL(const extended_type_info *) 
+extended_type_info::find(const char *key) {
+    assert(NULL != key);
+    const detail::ktmap & k = singleton<detail::ktmap>::get_const_instance();
+    const detail::extended_type_info_arg eti_key(key);
+    const detail::ktmap::const_iterator it = k.find(& eti_key);
+    if(k.end() == it)
+        return NULL;
+    return *(it);
 }
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) 
+BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
 extended_type_info::extended_type_info(
-    const char * type_info_key
+    const unsigned int type_info_key
 ) :
     m_type_info_key(type_info_key),
-    m_self_registered(false),
-    m_key_registered(false),
-    m_is_destructing(false)
-{}
+    m_key(NULL)
+{
+    // make sure that the ktmap is instantiated before 
+    // the first key is added to it.
+    singleton<detail::ktmap>::get_const_instance();
+}
 
 BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) 
 extended_type_info::~extended_type_info(){
-    // remove entries in maps which correspond to this type
-    m_is_destructing = true;
-    BOOST_TRY{
-        if(m_self_registered)
-            detail::tkmap::purge(this);
-        if(m_key_registered)
-            detail::ktmap::purge(this);
-        unregister_void_casts(this);
-    }
-    BOOST_CATCH(...){}
-    BOOST_CATCH_END
-}
-
-BOOST_SERIALIZATION_DECL(int)
-extended_type_info::type_info_key_cmp(const extended_type_info & rhs) const {
-    if(m_type_info_key == rhs.m_type_info_key)
-        return 0;
-    //return strcmp(lhs.type_info_key, rhs.type_info_key);
-    // all we require is that the type_info_key be unique
-    // so just compare the addresses
-    return m_type_info_key < rhs.m_type_info_key ? -1 : 1;
+    if(NULL == m_key)
+        return;
+    key_unregister();
 }
 
-BOOST_SERIALIZATION_DECL(const extended_type_info *) 
-extended_type_info::find(const extended_type_info * t)
-{
-    return detail::tkmap::find(t);
+BOOST_SERIALIZATION_DECL(bool)  
+extended_type_info::operator<(const extended_type_info &rhs) const {
+    if(m_type_info_key == rhs.m_type_info_key){
+        return is_less_than(rhs);
+    }
+    if(m_type_info_key < rhs.m_type_info_key)
+        return true;
+    return false;
 }
 
 BOOST_SERIALIZATION_DECL(bool)
-extended_type_info::operator<(const extended_type_info &rhs) const {
-    int i = type_info_key_cmp(rhs);
-    if(i < 0)
+extended_type_info::operator==(const extended_type_info &rhs) const {
+    // short cut for a common cases
+    if(this == & rhs)
         return true;
-    if(i > 0)
+    if(m_type_info_key != rhs.m_type_info_key){
         return false;
-    assert(! is_destructing());
-    assert(! rhs.is_destructing());
-    return less_than(rhs);
-}
+    }
+    return is_equal(rhs);
+};
 
 } // namespace serialization
 } // namespace boost

Modified: branches/release/libs/serialization/src/extended_type_info_no_rtti.cpp
==============================================================================
--- branches/release/libs/serialization/src/extended_type_info_no_rtti.cpp	(original)
+++ branches/release/libs/serialization/src/extended_type_info_no_rtti.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,8 +9,10 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <boost/config.hpp>
 #include <cstring>
+#include <cstddef> // NULL
+
+#include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ using ::strcmp; }
 #endif
@@ -18,21 +20,42 @@
 #define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/extended_type_info_no_rtti.hpp>
 
+#define EXTENDED_TYPE_INFO_NO_RTTI_KEY 2
+
 namespace boost { 
 namespace serialization { 
 namespace detail { 
 
+BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())  
+extended_type_info_no_rtti_0::extended_type_info_no_rtti_0() :
+    extended_type_info(EXTENDED_TYPE_INFO_NO_RTTI_KEY)
+{}
+
 BOOST_SERIALIZATION_DECL(bool)
-extended_type_info_no_rtti_0::less_than(
+extended_type_info_no_rtti_0::is_less_than(
     const boost::serialization::extended_type_info &rhs) const 
 {
-    return std::strcmp(m_key, rhs.get_key()) < 0;
+    const char * l = m_key;
+    const char * r = rhs.get_key();
+    assert(NULL != l);
+    assert(NULL != r);
+    return std::strcmp(l, r) < 0;
 }
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())  
-extended_type_info_no_rtti_0::extended_type_info_no_rtti_0() :
-    boost::serialization::extended_type_info("extended_type_info_no_rtti")
-{}
+BOOST_SERIALIZATION_DECL(bool)
+extended_type_info_no_rtti_0::is_equal(
+    const boost::serialization::extended_type_info &rhs) const 
+{
+    const char * l = m_key;
+    const char * r = rhs.get_key();
+    if(l == r)
+        return true;
+    if(NULL == l)
+        return false;
+    if(NULL == r)
+        return false;
+    return 0 == std::strcmp(l, r);
+}
 
 BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())  
 extended_type_info_no_rtti_0::~extended_type_info_no_rtti_0()

Modified: branches/release/libs/serialization/src/extended_type_info_typeid.cpp
==============================================================================
--- branches/release/libs/serialization/src/extended_type_info_typeid.cpp	(original)
+++ branches/release/libs/serialization/src/extended_type_info_typeid.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -9,6 +9,16 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <algorithm>
+#include <set>
+#include <cassert>
+#include <typeinfo>
+#include <cstddef> // NULL
+
+#include <boost/detail/no_exceptions_support.hpp>
+
+#include <boost/serialization/singleton.hpp>
+
 #define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/extended_type_info_typeid.hpp>
 
@@ -16,49 +26,105 @@
 namespace serialization { 
 namespace detail {
 
-BOOST_SERIALIZATION_DECL(bool)
-extended_type_info_typeid_0::less_than(const extended_type_info &rhs) const
+#define EXTENDED_TYPE_INFO_TYPE_KEY 1
+
+struct type_compare
 {
-    return 0 != get_eti().before(
-        static_cast<const extended_type_info_typeid_0 &>(rhs).get_eti()
+    bool
+    operator()(
+        const extended_type_info_typeid_0 * lhs,
+        const extended_type_info_typeid_0 * rhs
+    ) const {
+        return lhs->is_less_than(*rhs);
+    }
+};
+
+typedef std::multiset<
+    const extended_type_info_typeid_0 *,
+    type_compare
+> tkmap;
+    
+BOOST_SERIALIZATION_DECL(bool) 
+extended_type_info_typeid_0::is_less_than(
+    const boost::serialization::extended_type_info & rhs
+) const {
+    return m_ti->before(
+        *(static_cast<const extended_type_info_typeid_0 &>(rhs).m_ti)
     );
 }
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) 
+BOOST_SERIALIZATION_DECL(bool) 
+extended_type_info_typeid_0::is_equal(
+    const boost::serialization::extended_type_info & rhs
+) const {
+    return * m_ti == *(static_cast<const extended_type_info_typeid_0 &>(rhs).m_ti);
+}
+
+BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
 extended_type_info_typeid_0::extended_type_info_typeid_0() :
-    extended_type_info("extended_type_info_typeid")
+    extended_type_info(EXTENDED_TYPE_INFO_TYPE_KEY),
+    m_ti(NULL)
 {}
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) 
+BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
 extended_type_info_typeid_0::~extended_type_info_typeid_0()
 {}
 
+BOOST_SERIALIZATION_DECL(void) 
+extended_type_info_typeid_0::type_register(const std::type_info & ti){
+    m_ti = & ti;
+    singleton<tkmap>::get_mutable_instance().insert(this);
+}
+
+BOOST_SERIALIZATION_DECL(void) 
+extended_type_info_typeid_0::type_unregister()
+{
+    if(NULL == m_ti)
+        return;
+    
+    tkmap & x = singleton<tkmap>::get_mutable_instance();
+    tkmap::iterator start = x.lower_bound(this);
+    tkmap::iterator end = x.upper_bound(this);
+    assert(start != end);
+
+    // remove entry in map which corresponds to this type
+    do{
+        if(this == *start){
+            x.erase(start);
+            break;
+    }
+    }while(++start != end);
+
+    m_ti = NULL;
+}
+
 // this derivation is used for creating search arguments
 class extended_type_info_typeid_arg : 
     public extended_type_info_typeid_0
 {
 private:
-    const std::type_info & ti;
-    virtual const std::type_info &get_eti() const
-    {
-        return ti;
-    }
 public:
-    extended_type_info_typeid_arg(const std::type_info & ti_)
-        : ti(ti_)
-    { 
+    extended_type_info_typeid_arg(const std::type_info & ti){ 
         // note absense of self register and key as this is used only as
         // search argument given a type_info reference and is not to 
         // be added to the map.
+        m_ti = & ti;
+    }
+    ~extended_type_info_typeid_arg(){
+        m_ti = NULL;
     }
 };
 
 BOOST_SERIALIZATION_DECL(const extended_type_info *)
-extended_type_info_typeid_0::get_derived_extended_type_info(
+extended_type_info_typeid_0::get_extended_type_info(
     const std::type_info & ti
-){
+) const {
     detail::extended_type_info_typeid_arg etia(ti);
-    return extended_type_info::find(& etia);
+    const tkmap & t = singleton<tkmap>::get_const_instance();
+    const tkmap::const_iterator it = t.find(& etia);
+    if(t.end() == it)
+        return NULL;
+    return *(it);
 }
 
 } // namespace detail

Modified: branches/release/libs/serialization/src/void_cast.cpp
==============================================================================
--- branches/release/libs/serialization/src/void_cast.cpp	(original)
+++ branches/release/libs/serialization/src/void_cast.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -14,15 +14,18 @@
 #endif
 
 #include <cassert>
+#include <cstddef> // NULL
 
 // STL
-#include <set>
+#include <vector>
 #include <functional>
 #include <algorithm>
 #include <cassert>
 
 // BOOST
-#include <boost/shared_ptr.hpp>
+#define BOOST_SERIALIZATION_SOURCE
+#include <boost/serialization/singleton.hpp>
+
 #define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/extended_type_info.hpp>
 #include <boost/serialization/void_cast.hpp>
@@ -31,300 +34,242 @@
 namespace serialization {
 namespace void_cast_detail {
 
+#if 0
+// registry of casting objects
 struct void_caster_compare
 {
     bool
     operator()(
-        shared_ptr<const void_caster> lhs, 
-        shared_ptr<const void_caster> rhs ) const
-    {
-        if( lhs.get()->m_derived_type < rhs.get()->m_derived_type )
+        const void_caster * lhs, 
+        const void_caster * rhs 
+    ) const {
+        if( lhs->m_derived < rhs->m_derived )
             return true;
-        
-        if( rhs.get()->m_derived_type < lhs.get()->m_derived_type)
-            return false;
-        
-        if( lhs.get()->m_base_type < rhs.get()->m_base_type )
+        if( lhs->m_base < rhs->m_base )
             return true;
-
         return false;
     }
 };
 
-struct null_deleter
-{
-    void operator()(void const *) const
-    {}
-};
+typedef std::set<const void_caster *, void_caster_compare> set_type;
+#endif
 
-// it turns out that at least one compiler (msvc 6.0) doesn't guarentee
-// to destroy static objects in exactly the reverse sequence that they
-// are constructed.  To guarentee this, use a singleton pattern
-class void_caster_registry
-{
-    typedef shared_ptr<const void_caster> value_type;
-    typedef std::set<value_type, void_caster_compare> set_type;
-    set_type m_set;
-    static void_caster_registry * m_self;
-    static void_caster_registry * 
-    self(){
-        if(NULL == m_self){
-            static void_caster_registry instance;
-            m_self = & instance;
-        }
-        return m_self;
-    }
-    void_caster_registry(){}
-public:
-    ~void_caster_registry(){
-        m_self = 0;
-    }
-    typedef set_type::iterator iterator;
-    typedef set_type::const_iterator const_iterator;
-    static iterator 
-    begin() {
-        return self()->m_set.begin();
-    }
-    static iterator 
-    end() {
-        return self()->m_set.end();
-    }
-    static const_iterator 
-    find(void_caster * vcp){
-        return self()->m_set.find(value_type(vcp, null_deleter()));
-    }
-    static std::pair<iterator, bool> 
-    insert(const value_type & vcp){
-        return self()->m_set.insert(vcp);
-    }
-    static bool 
-    empty(){
-        if(NULL == m_self)
-            return true;
-        return m_self->m_set.empty();
-    }
-    static void 
-    purge(const extended_type_info * eti);
-};
+typedef std::vector<const void_caster *> set_type;
 
-void_caster_registry * void_caster_registry::m_self = NULL;
+typedef boost::serialization::singleton<set_type> void_caster_registry;
 
-void 
-void_caster_registry::purge(const extended_type_info * eti){
-    if(NULL == m_self)
-        return;
-    if(! empty()){
-        iterator i = m_self->m_set.begin();
-        while(i != m_self->m_set.end()){
-            // note that the erase might invalidate i so save it here
-            iterator j = i++;
-            if((*j)->includes(eti))
-                m_self->m_set.erase(j);
-        }
-    }
+inline bool
+void_caster::operator==(void_caster const & rhs) const{
+    if(m_derived != rhs.m_derived)
+        return false;
+    if(m_base != rhs.m_base)
+        return false;
+    return true;
 }
 
+// implementation of void caster base class
 BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
 void_caster::void_caster(
-    extended_type_info const & derived_type_,
-    extended_type_info const & base_type_ 
+    extended_type_info const & derived,
+    extended_type_info const & base 
 ) :
-    m_derived_type( derived_type_),
-    m_base_type(base_type_)
+    m_derived(derived),
+    m_base(base)
 {}
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
-void_caster::~void_caster(){}
-
-bool 
-void_caster::includes(const extended_type_info * eti) const {
-    return & m_derived_type == eti || & m_base_type == eti;
+BOOST_SERIALIZATION_DECL(void)
+void_caster::static_register() const {
+    void_caster_registry::get_mutable_instance().push_back(this);
+    // to do - add new void_caster_derived entries
+    // which can be generated by adding this new primitive
+    /*
+    while(){
+        if(!extend_down(this)
+        && !extend_up(this))
+            break;
+    }
+    */
 }
 
-void BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
-void_caster::static_register(const void_caster * vcp) 
-{
-    void_caster_registry::insert(shared_ptr<const void_caster>(vcp, null_deleter()));
+BOOST_SERIALIZATION_DECL(void)
+void_caster::static_unregister() const {
+    void_cast_detail::set_type & st 
+        = void_caster_registry::get_mutable_instance();
+    void_cast_detail::set_type::iterator it;
+    it = std::find(st.begin(), st.end(), this);
+    assert(st.end() != it);
+    st.erase(it);
+    // to do - remove all void_caster_derived entries
+    // which depend upon this primitive
+    /*
+    while(){
+        if(!truncate_down(this)
+        && !truncate_up(this))
+            break;
+    }
+    */
 }
 
+#if 0
+// implementation of shortcut void caster
 class void_caster_derived : public void_caster
 {
     std::ptrdiff_t difference;
-    virtual void const*
-    upcast( void const* t ) const{
-        return static_cast<const char*> ( t ) + difference;
-    }
-    virtual void const*
-    downcast( void const* t ) const{
-        return static_cast<const char*> ( t ) - difference;
+    virtual void const *
+    upcast(void const * const t) const{
+        return static_cast<const char *> ( t ) + difference;
+    }
+    virtual void const *
+    downcast(void const * const t) const{
+        return static_cast<const char *> ( t ) - difference;
     }
 public:
     void_caster_derived(
-        extended_type_info const& derived_type_,
-        extended_type_info const& base_type_,
-        std::ptrdiff_t difference_
+        extended_type_info const & derived,
+        extended_type_info const & base,
+        std::ptrdiff_t difference
     ) :
-        void_caster(derived_type_, base_type_),
-        difference( difference_ )
-    {}
+        void_caster(derived, base),
+        difference( difference )
+    {
+        this->static_register();
+    }
+    ~void_caster_derived(){
+        this->static_unregister();
+    }
 };
+#endif
 
 // just used as a search key
 class void_caster_argument : public void_caster
 {
-    virtual void const*
-    upcast( void const* t ) const {
+    virtual void const *
+    upcast(void const * const t) const {
         assert(false);
         return NULL;
     }
-    virtual void const*
-    downcast( void const* t ) const {
+    virtual void const *
+    downcast( void const * const t) const {
         assert(false);
         return NULL;
     }
 public:
     void_caster_argument(
-        extended_type_info const& derived_type_,
-        extended_type_info const& base_type_
+        extended_type_info const & derived,
+        extended_type_info const & base
     ) :
-        void_caster(derived_type_, base_type_)
+        void_caster(derived, base)
     {}
+    ~void_caster_argument(){};
 };
 
-} // namespace void_cast_detail
+struct match {
+    void_cast_detail::void_caster_argument const * const m_ca;
 
-void  BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
-unregister_void_casts(extended_type_info *eti)
-{
-    void_cast_detail::void_caster_registry::purge(eti);
-}
+    match(void_cast_detail::void_caster_argument const * const ca) :
+        m_ca(ca)
+    {}
+    bool operator()(const void_cast_detail::void_caster * vc){
+        return * vc == * m_ca;
+    };
+};
+
+} // namespace void_cast_detail
 
 // Given a void *, assume that it really points to an instance of one type
 // and alter it so that it would point to an instance of a related type.
 // Return the altered pointer. If there exists no sequence of casts that
 // can transform from_type to to_type, return a NULL.  
-
-BOOST_SERIALIZATION_DECL(void const *)
+BOOST_SERIALIZATION_DECL(void const *)  
 void_upcast(
-    extended_type_info const & derived_type,
-    extended_type_info const & base_type,
-    void const * const t,
-    bool top
+    extended_type_info const & derived,
+    extended_type_info const & base,
+    void const * const t
 ){
     // same types - trivial case
-    if (derived_type == base_type)
+    if (derived == base)
         return t;
-    
+
     // check to see if base/derived pair is found in the registry
-    void_cast_detail::void_caster_argument ca(derived_type, base_type );
-    void_cast_detail::void_caster_registry::const_iterator it;
-    it = void_cast_detail::void_caster_registry::find( &ca );
+    const void_cast_detail::set_type & s
+        = void_cast_detail::void_caster_registry::get_const_instance();
+    void_cast_detail::set_type::const_iterator it;
+    void_cast_detail::void_caster_argument ca(derived, base);
+
+    it = std::find_if(
+        s.begin(), 
+        s.end(),
+        void_cast_detail::match(& ca)
+    );
     
-    const void * t_new = NULL;
-
     // if so
-    if (it != void_cast_detail::void_caster_registry::end())
+    if (s.end() != it)
         // we're done
         return (*it)->upcast(t);
 
     // try to find a chain that gives us what we want
-    for(
-        it = void_cast_detail::void_caster_registry::begin();
-        it != void_cast_detail::void_caster_registry::end();
-        ++it
-    ){
+    for(it = s.begin(); it != s.end(); ++it){
         // if the current candidate doesn't cast to the desired target type
-        if ((*it)->m_base_type == base_type){
+        if((*it)->m_base == base){
             // if the current candidate casts from the desired source type
-            if ((*it)->m_derived_type == derived_type){
+            if ((*it)->m_derived == derived){
                 // we have a base/derived match - we're done
                 // cast to the intermediate type
-                t_new = (*it)->upcast(t);
-                break;
-            }
-            t_new = void_upcast(derived_type, (*it)->m_derived_type, t, false);
-            if (NULL != t_new){
-                t_new = (*it)->upcast(t_new);
-                assert(NULL != t_new);
-                if(top){
-                    // register the this pair so we will have to go through
-                    // keep this expensive search process more than once.
-                    void_cast_detail::void_caster * vcp = 
-                        new void_cast_detail::void_caster_derived( 
-                            derived_type,
-                            base_type,
-                            static_cast<const char*>(t_new) - static_cast<const char*>(t)
-                        );
-                    void_cast_detail::void_caster_registry::insert(
-                        shared_ptr<const void_cast_detail::void_caster>(vcp)
-                    );
-                }
-                break;
+                return (*it)->upcast(t);
             }
+            const void * t_new;
+            t_new = void_upcast(derived, (*it)->m_derived, t);
+            if(NULL != t_new)
+                return (*it)->upcast(t_new);
         }
     }
-    return t_new;
+    return NULL;
 }
 
-BOOST_SERIALIZATION_DECL(void const *)
+BOOST_SERIALIZATION_DECL(void const *)  
 void_downcast(
-    const extended_type_info & derived_type,
-    const extended_type_info & base_type,
-    const void * const t,
-    bool top
+    extended_type_info const & derived,
+    extended_type_info const & base,
+    void const * const t
 ){
     // same types - trivial case
-    if (derived_type == base_type)
+    if (derived == base)
         return t;
-    
+
     // check to see if base/derived pair is found in the registry
-    void_cast_detail::void_caster_argument ca(derived_type, base_type );
-    void_cast_detail::void_caster_registry::const_iterator it;
-    it = void_cast_detail::void_caster_registry::find( &ca );
-    
+    const void_cast_detail::set_type & s
+        = void_cast_detail::void_caster_registry::get_const_instance();
+    void_cast_detail::set_type::const_iterator it;
+    void_cast_detail::void_caster_argument ca(derived, base);
+
+    it = std::find_if(
+        s.begin(), 
+        s.end(),
+        void_cast_detail::match(& ca)
+    );
+        
     // if so
-    if (it != void_cast_detail::void_caster_registry::end())
+    if (s.end() != it)
         // we're done
-        return (*it)->downcast(t);
+        return(*it)->downcast(t);
 
-    const void * t_new = NULL;
     // try to find a chain that gives us what we want
-    for(
-        it = void_cast_detail::void_caster_registry::begin();
-        it != void_cast_detail::void_caster_registry::end();
-        ++it
-    ){
-        // if the current candidate doesn't casts from the desired target type
-        if ((*it)->m_derived_type == derived_type){
-            // if the current candidate casts to the desired source type
-            if ((*it)->m_base_type == base_type){
+    for(it = s.begin(); it != s.end(); ++it){
+        // if the current candidate doesn't cast to the desired target type
+        if ((*it)->m_derived == derived){
+            // if the current candidate casts from the desired source type
+            if ((*it)->m_base == base){
                 // we have a base/derived match - we're done
                 // cast to the intermediate type
-                t_new = (*it)->downcast(t);
-                break;
-            }
-            t_new = void_downcast((*it)->m_base_type, base_type, t, false);
-            if (NULL != t_new){
-                t_new = (*it)->downcast(t_new);
-                assert(NULL != t_new);
-                if(top){
-                    // register the this pair so we will have to go through
-                    // keep this expensive search process more than once.
-                    void_cast_detail::void_caster * vcp = 
-                        new void_cast_detail::void_caster_derived( 
-                            derived_type,
-                            base_type,
-                            static_cast<const char*>(t) - static_cast<const char*>(t_new)
-                        );
-                    void_cast_detail::void_caster_registry::insert(
-                        shared_ptr<const void_cast_detail::void_caster>(vcp)
-                    );
-                }
-                break;
+                return (*it)->downcast(t);
             }
+            const void * t_new;
+            t_new = void_downcast((*it)->m_base, base, t);
+            if(NULL != t_new)
+                return (*it)->downcast(t_new);
         }
     }
-    return t_new;
+    return NULL;
 }
 
 } // namespace serialization

Modified: branches/release/libs/serialization/src/xml_grammar.cpp
==============================================================================
--- branches/release/libs/serialization/src/xml_grammar.cpp	(original)
+++ branches/release/libs/serialization/src/xml_grammar.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -49,7 +49,7 @@
 
 template<>
 void xml_grammar::init_chset(){
-    Char = chset_t("\x9\xA\xD\x20-\xFF");
+    Char = chset_t("\x9\xA\xD\x20-\x7f\x80\x81-\xFF"); 
     Letter = chset_t("\x41-\x5A\x61-\x7A\xC0-\xD6\xD8-\xF6\xF8-\xFF");
     Digit = chset_t("0-9");
     Extender = chset_t('\xB7');

Modified: branches/release/libs/serialization/src/xml_woarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/xml_woarchive.cpp	(original)
+++ branches/release/libs/serialization/src/xml_woarchive.cpp	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -26,6 +26,7 @@
 namespace boost {
 namespace archive {
 
+#if 0
 BOOST_WARCHIVE_DECL(std::wostream &)
 operator<<(std::wostream &os, const char *t){
     for(;;){
@@ -53,6 +54,7 @@
     os.put(wc);
     return os;
 }
+#endif
 
 template class basic_xml_oarchive<xml_woarchive> ;
 template class xml_woarchive_impl<xml_woarchive> ;

Modified: branches/release/libs/serialization/test/Jamfile.v2
==============================================================================
--- branches/release/libs/serialization/test/Jamfile.v2	(original)
+++ branches/release/libs/serialization/test/Jamfile.v2	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -84,11 +84,11 @@
         
         [ test-bsl-run-no-lib test_utf8_codecvt 
             : ../src/utf8_codecvt_facet
-            : <dependency>../../config/test/all//BOOST_NO_STD_WSTREAMBUF
+            : <dependency>../../config/test//BOOST_NO_STD_WSTREAMBUF
         ]
         [ test-bsl-run-no-lib test_codecvt_null 
             : ../src/codecvt_null 
-            : <dependency>../../config/test/all//BOOST_NO_STD_WSTREAMBUF
+            : <dependency>../../config/test//BOOST_NO_STD_WSTREAMBUF
         ]
 
         # should fail compilation

Modified: branches/release/libs/serialization/util/test.jam
==============================================================================
--- branches/release/libs/serialization/util/test.jam	(original)
+++ branches/release/libs/serialization/util/test.jam	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -94,7 +94,7 @@
             # both stlport and msvc6 define iswspace
             <toolset>msvc,<stdlib>stlport:<linkflags>"-force:multiple"
             <dependency>$(save-test)
-            <dependency>../../config/test/all//BOOST_NO_STD_WSTREAMBUF
+            <dependency>../../config/test//BOOST_NO_STD_WSTREAMBUF
     ] ;
     return $(tests) ;
 }

Modified: branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln
==============================================================================
--- branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln	(original)
+++ branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -7,10 +7,6 @@
         ProjectSection(ProjectDependencies) = postProject
         EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibraryW", "LibraryW.vcproj", "{30E10563-960A-11D7-9FE9-525400E2CF85}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_smart_cast", "test_smart_cast.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
         ProjectSection(ProjectDependencies) = postProject
         EndProjectSection
@@ -259,7 +255,7 @@
         ProjectSection(ProjectDependencies) = postProject
         EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_const_fail", "test_const_fail.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_const_warn", "test_const_fail.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
         ProjectSection(ProjectDependencies) = postProject
         EndProjectSection
 EndProject
@@ -279,12 +275,58 @@
         ProjectSection(ProjectDependencies) = postProject
         EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibraryW", "LibraryW.vcproj", "{30E10563-960A-11D7-9FE9-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_valarray", "test_valarray.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo_dll", "demo_dll.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dll_a", "dll_a.vcproj", "{CED1BD64-563F-485D-AE69-668797013AA0}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dll_derived2", "dll_derived2.vcproj", "{CED1BD64-563F-485D-AE69-668797013AA0}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_dll_exported", "test_dll_exported.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dll_base", "dll_base.vcproj", "{CED1BD64-563F-485D-AE69-668797013AA0}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_dll_simple", "test_dll_simple.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_dll_plugin", "test_dll_plugin.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_complex", "test_complex.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_zmisc", "test_zmisc.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
         GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
                 Debug runtime-dynamic = Debug runtime-dynamic
                 Debug runtime-dynamic binary_archive = Debug runtime-dynamic binary_archive
                 Debug runtime-dynamic text_archive = Debug runtime-dynamic text_archive
                 Debug runtime-dynamic text_warchive = Debug runtime-dynamic text_warchive
+		Debug runtime-dynamic threading-multi = Debug runtime-dynamic threading-multi
                 Debug runtime-dynamic xml_archive = Debug runtime-dynamic xml_archive
                 Debug runtime-dynamic xml_warchive = Debug runtime-dynamic xml_warchive
                 Debug runtime-static = Debug runtime-static
@@ -299,6 +341,7 @@
                 Debug runtime-static threading-multi xml_warchive = Debug runtime-static threading-multi xml_warchive
                 Debug runtime-static xml_archive = Debug runtime-static xml_archive
                 Debug runtime-static xml_warchive = Debug runtime-static xml_warchive
+		Release = Release
                 Release runtime-dynamic = Release runtime-dynamic
                 Release runtime-dynamic binary_archive = Release runtime-dynamic binary_archive
                 Release runtime-dynamic text_archive = Release runtime-dynamic text_archive
@@ -319,6 +362,8 @@
                 Release runtime-static xml_warchive = Release runtime-static xml_warchive
         EndGlobalSection
         GlobalSection(ProjectConfiguration) = postSolution
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -327,6 +372,8 @@
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -355,6 +402,8 @@
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -391,6 +440,8 @@
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -399,6 +450,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -427,6 +480,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -463,78 +518,164 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -543,6 +684,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -571,6 +714,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -607,6 +752,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -615,6 +762,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -643,6 +792,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -679,6 +830,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -687,6 +840,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -715,6 +870,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -751,6 +908,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -759,6 +918,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -787,6 +948,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -823,6 +986,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -831,6 +996,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -859,6 +1026,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -895,6 +1064,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -903,6 +1074,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -931,6 +1104,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -967,6 +1142,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -975,6 +1152,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1003,6 +1182,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1039,6 +1220,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1047,6 +1230,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1075,6 +1260,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1111,6 +1298,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1119,6 +1308,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1147,6 +1338,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1183,6 +1376,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1191,6 +1386,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1219,6 +1416,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1255,6 +1454,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1263,6 +1464,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1291,6 +1494,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1327,6 +1532,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1335,6 +1542,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1363,6 +1572,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1399,6 +1610,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1407,6 +1620,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1435,6 +1650,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1471,6 +1688,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1479,6 +1698,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1507,6 +1728,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1543,6 +1766,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1551,6 +1776,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1579,6 +1806,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1615,6 +1844,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1623,6 +1854,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1651,6 +1884,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1687,6 +1922,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1695,6 +1932,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1723,6 +1962,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1759,6 +2000,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1767,6 +2010,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1795,6 +2040,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1831,6 +2078,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1839,6 +2088,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1867,6 +2118,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1903,6 +2156,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1911,6 +2166,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1939,6 +2196,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -1975,6 +2234,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1983,6 +2244,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2011,6 +2274,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2047,6 +2312,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2055,6 +2322,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2083,6 +2352,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2119,6 +2390,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2127,6 +2400,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2155,6 +2430,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2191,6 +2468,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2199,6 +2478,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2227,6 +2508,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2263,6 +2546,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2271,6 +2556,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2299,6 +2586,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2335,6 +2624,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2343,6 +2634,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2371,6 +2664,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2407,6 +2702,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2415,6 +2712,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2443,6 +2742,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2479,6 +2780,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2487,6 +2790,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2515,6 +2820,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2551,6 +2858,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2559,6 +2868,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2587,6 +2898,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2623,6 +2936,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2631,6 +2946,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2659,6 +2976,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2695,6 +3014,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2703,6 +3024,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2731,6 +3054,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2767,6 +3092,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2775,6 +3102,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2803,6 +3132,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2839,6 +3170,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2847,6 +3180,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2875,6 +3210,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2911,6 +3248,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2919,6 +3258,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2947,6 +3288,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -2983,6 +3326,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-dynamic text_archive|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-dynamic text_archive|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2991,6 +3336,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3019,6 +3366,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3055,6 +3404,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3063,6 +3414,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3091,6 +3444,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3127,6 +3482,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3135,6 +3492,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3163,6 +3522,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3199,6 +3560,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3207,6 +3570,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3235,6 +3600,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3271,6 +3638,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3279,6 +3648,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3307,6 +3678,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3343,6 +3716,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3351,6 +3726,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3379,6 +3756,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3415,6 +3794,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3423,6 +3804,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3451,6 +3834,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3487,6 +3872,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3495,6 +3882,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3523,6 +3912,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3559,6 +3950,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3567,6 +3960,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3595,6 +3990,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3631,6 +4028,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3639,6 +4038,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3667,6 +4068,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3703,6 +4106,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3711,6 +4116,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3739,6 +4146,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3775,6 +4184,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3783,6 +4194,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3811,6 +4224,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3847,6 +4262,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3855,6 +4272,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3883,6 +4302,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3919,6 +4340,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3927,6 +4350,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3955,6 +4380,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -3991,6 +4418,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -3999,6 +4428,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4027,6 +4458,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4063,6 +4496,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4071,6 +4506,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4099,6 +4536,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4135,6 +4574,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4143,6 +4584,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4171,6 +4614,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4207,6 +4652,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4215,6 +4662,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4243,6 +4692,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4279,6 +4730,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4287,6 +4740,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4315,6 +4770,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4351,6 +4808,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4359,6 +4818,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4387,6 +4848,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4423,6 +4886,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4431,6 +4896,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4459,6 +4926,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4495,6 +4964,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4503,6 +4974,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4531,6 +5004,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4567,6 +5042,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4575,6 +5052,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4603,6 +5082,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4639,6 +5120,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4647,6 +5130,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4675,6 +5160,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4711,6 +5198,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4719,6 +5208,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4747,6 +5238,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4783,6 +5276,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4791,6 +5286,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4819,6 +5316,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4855,6 +5354,476 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4863,6 +5832,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4891,6 +5862,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4927,6 +5900,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4935,6 +5910,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -4963,6 +5940,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -4999,6 +5978,164 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_warchive.Build.0 = Release|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5007,6 +6144,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5035,6 +6174,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -5071,6 +6212,86 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_archive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_archive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_warchive.ActiveCfg = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-static xml_warchive.Build.0 = Debug|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-dynamic xml_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi binary_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi text_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static threading-multi xml_warchive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_archive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_archive.Build.0 = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_warchive.ActiveCfg = Release|Win32
+		{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_warchive.Build.0 = Release|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5079,6 +6300,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5107,6 +6330,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -5143,6 +6368,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5151,6 +6378,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5179,6 +6408,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -5215,6 +6446,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5223,6 +6456,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5251,6 +6486,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
@@ -5287,6 +6524,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5295,6 +6534,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
@@ -5323,6 +6564,8 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32

Deleted: branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.suo
==============================================================================
--- branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.suo	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
+++ (empty file)
@@ -1 +0,0 @@
-ÐÏࡱ
\ No newline at end of file

Modified: branches/release/libs/serialization/vc7ide/Library.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/Library.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/Library.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -43,7 +43,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization-vc71-mt-gd-1_35.lib"/>
+				OutputFile="$(OutDir)/boost_serialization-vc71-mt-gd-1_34_1.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -65,7 +65,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -80,7 +80,7 @@
                                 FavorSizeOrSpeed="1"
                                 OmitFramePointers="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;BOOST_TEST_NO_AUTO_LINK=1 "
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;BOOST_ALL_DYN_LINK=1"
                                 RuntimeLibrary="2"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -96,7 +96,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization.lib"/>
+				OutputFile="$(OutDir)/boost_serialization-vc71-mt-1_34_1.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -118,7 +118,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -147,7 +147,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization.lib"/>
+				OutputFile="$(OutDir)/libboost_serialization-vc71-sgd-1_34_1.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -169,7 +169,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -198,7 +198,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization.lib"/>
+				OutputFile="$(OutDir)/libboost_serialization-vc71-mt-sgd-1_34_1.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -220,7 +220,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -245,13 +245,13 @@
                                 UsePrecompiledHeader="0"
                                 WarningLevel="3"
                                 Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="0"
+				DebugInformationFormat="1"
                                 CompileAs="0"/>
                         <Tool
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization.lib"/>
+				OutputFile="$(OutDir)/libboost_serialization-vc71-s-1_34_1.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -273,7 +273,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -289,7 +289,7 @@
                                 OmitFramePointers="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;BOOST_TEST_NO_AUTO_LINK=1 "
-				RuntimeLibrary="0"
+				RuntimeLibrary="4"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
                                 TreatWChar_tAsBuiltInType="TRUE"
@@ -304,7 +304,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization.lib"/>
+				OutputFile="$(OutDir)/libboost_serialization-msvc71-mt-s-1_34_1.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -324,6 +324,61 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				SmallerTypeCheck="FALSE"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/boost_serialization-vc71-mt-gd-1_34_1.dll"
+				GenerateDebugInformation="TRUE"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
@@ -390,6 +445,9 @@
                                 RelativePath="..\..\..\boost\serialization\collections_save_imp.hpp">
                         </File>
                         <File
+				RelativePath="..\..\..\boost\serialization\complex.hpp">
+			</File>
+			<File
                                 RelativePath="..\..\..\boost\serialization\deque.hpp">
                         </File>
                         <File
@@ -479,6 +537,9 @@
                                 RelativePath="..\..\..\boost\archive\basic_binary_oprimitive.hpp">
                         </File>
                         <File
+				RelativePath="..\..\..\boost\archive\basic_streambuf_locale_saver.hpp">
+			</File>
+			<File
                                 RelativePath="..\..\..\boost\archive\basic_text_iarchive.hpp">
                         </File>
                         <File
@@ -499,6 +560,12 @@
                         <File
                                 RelativePath="..\..\..\boost\archive\basic_xml_oarchive.hpp">
                         </File>
+			<File
+				RelativePath="..\..\..\boost\archive\detail\polymorphic_iarchive_route.hpp">
+			</File>
+			<File
+				RelativePath="..\..\..\boost\archive\detail\polymorphic_oarchive_route.hpp">
+			</File>
                 </Filter>
                 <Filter
                         Name="Archive Detail"
@@ -543,15 +610,9 @@
                                 RelativePath="..\..\..\boost\archive\detail\common_oarchive.hpp">
                         </File>
                         <File
-				RelativePath="..\..\..\boost\archive\detail\dynamically_initialized.hpp">
-			</File>
-			<File
                                 RelativePath="..\..\..\boost\archive\array\iarchive.hpp">
                         </File>
                         <File
-				RelativePath=".\iarray_serializer.hpp">
-			</File>
-			<File
                                 RelativePath="..\..\..\boost\archive\detail\interface_iarchive.hpp">
                         </File>
                         <File
@@ -561,21 +622,12 @@
                                 RelativePath="..\..\..\boost\archive\detail\iserializer.hpp">
                         </File>
                         <File
-				RelativePath="..\..\..\boost\archive\detail\known_archive_types.hpp">
-			</File>
-			<File
                                 RelativePath="..\..\..\boost\archive\array\oarchive.hpp">
                         </File>
                         <File
                                 RelativePath="..\..\..\boost\archive\detail\oserializer.hpp">
                         </File>
                         <File
-				RelativePath="..\..\..\boost\archive\detail\polymorphic_iarchive_dispatch.hpp">
-			</File>
-			<File
-				RelativePath="..\..\..\boost\archive\detail\polymorphic_oarchive_dispatch.hpp">
-			</File>
-			<File
                                 RelativePath="..\..\..\boost\archive\detail\register_archive.hpp">
                         </File>
                         <File
@@ -616,12 +668,18 @@
                                 RelativePath="..\..\..\boost\serialization\extended_type_info_typeid.hpp">
                         </File>
                         <File
+				RelativePath="..\..\..\boost\serialization\factory.hpp">
+			</File>
+			<File
                                 RelativePath="..\..\..\boost\serialization\force_include.hpp">
                         </File>
                         <File
                                 RelativePath="..\..\..\boost\pfto.hpp">
                         </File>
                         <File
+				RelativePath="..\..\..\boost\serialization\singleton.hpp">
+			</File>
+			<File
                                 RelativePath="..\..\..\boost\smart_cast.hpp">
                         </File>
                         <File
@@ -726,9 +784,6 @@
                                 RelativePath="..\src\basic_pointer_oserializer.cpp">
                         </File>
                         <File
-				RelativePath="..\src\basic_serializer_map.cpp">
-			</File>
-			<File
                                 RelativePath="..\src\basic_text_iprimitive.cpp">
                                 <FileConfiguration
                                         Name="Release runtime-dynamic|Win32">
@@ -850,6 +905,9 @@
                                 RelativePath="..\..\..\boost\archive\text_oarchive.hpp">
                         </File>
                         <File
+				RelativePath="..\..\..\boost\archive\xml_archive_exception.hpp">
+			</File>
+			<File
                                 RelativePath="..\..\..\boost\archive\xml_iarchive.hpp">
                         </File>
                         <File

Modified: branches/release/libs/serialization/vc7ide/LibraryW.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/LibraryW.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/LibraryW.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -12,7 +12,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -34,8 +34,8 @@
                                 ForceConformanceInForLoopScope="TRUE"
                                 RuntimeTypeInfo="TRUE"
                                 UsePrecompiledHeader="0"
-				ObjectFile="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi/"
-				ProgramDataBaseFileName="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi/vc70.pdb"
+				ObjectFile="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi"
+				ProgramDataBaseFileName="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multivc70.pdb"
                                 WarningLevel="3"
                                 Detect64BitPortabilityProblems="FALSE"
                                 DebugInformationFormat="1"/>
@@ -43,7 +43,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_wserialization-vc71-mt-gd-1_32.lib"/>
+				OutputFile="$(OutDir)/boost_wserialization-vc71-mt-gd-1_34_1.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -65,7 +65,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -96,7 +96,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_wserialization.lib"/>
+				OutputFile="$(OutDir)"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -118,7 +118,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -147,7 +147,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_wserialization.lib"/>
+				OutputFile="$(OutDir)"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -169,7 +169,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -199,7 +199,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_wserialization.lib"/>
+				OutputFile="$(OutDir)"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -221,7 +221,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)..\..\..\bin\boost\libs\serialization\build\libboost_wserialization.lib\vc-7_1\release\runtime-link-static\threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)..\..\..\bin\boost\libs\serialization\build\libboost_wserialization.lib\msvc-7.1\release\threading-multi\link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -252,7 +252,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_wserialization.lib"/>
+				OutputFile="$(OutDir)"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -274,7 +274,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="4"
                         CharacterSet="0">
@@ -303,7 +303,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_wserialization.lib"/>
+				OutputFile="$(OutDir)"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -323,6 +323,58 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;BOOST_TEST_NO_AUTO_LINK=1"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				SmallerTypeCheck="FALSE"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
@@ -401,6 +453,12 @@
                                                 Name="VCCLCompilerTool"
                                                 ObjectFile="$(IntDir)/$(InputName)1.obj"/>
                                 </FileConfiguration>
+				<FileConfiguration
+					Name="Debug runtime-dynamic threading-multi|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
                         </File>
                         <File
                                 RelativePath="..\src\xml_wiarchive.cpp">

Modified: branches/release/libs/serialization/vc7ide/demo.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -44,8 +44,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
+				DelayLoadDLLs=""
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -84,7 +84,8 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_DYN_LINK=1"
+				GeneratePreprocessedFile="0"
                                 MinimalRebuild="FALSE"
                                 BasicRuntimeChecks="0"
                                 RuntimeLibrary="3"
@@ -105,7 +106,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +135,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +167,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +196,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +231,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +262,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +297,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +328,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +359,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +387,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/demo_auto_ptr.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_auto_ptr.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_auto_ptr.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +386,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/demo_exception.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_exception.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_exception.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +386,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/demo_fast_archive.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_fast_archive.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_fast_archive.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +386,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/demo_pimpl.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_pimpl.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_pimpl.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +386,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/demo_polymorphic.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_polymorphic.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_polymorphic.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,15 +386,76 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
                 <File
-			RelativePath="..\test\../example/demo_polymorphic_A.cpp">
+			RelativePath="..\example\demo_polymorphic.cpp">
                 </File>
                 <File
-			RelativePath="..\example\demo_polymorphic.cpp">
+			RelativePath="..\example\demo_polymorphic_A.hpp">
                 </File>
         </Files>
         <Globals>

Modified: branches/release/libs/serialization/vc7ide/demo_portable_archive.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_portable_archive.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_portable_archive.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -23,7 +23,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1"
                                 MinimalRebuild="FALSE"
                                 BasicRuntimeChecks="0"
                                 RuntimeLibrary="5"
@@ -44,8 +44,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -84,7 +84,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_DYN_LINK=1"
                                 MinimalRebuild="FALSE"
                                 BasicRuntimeChecks="0"
                                 RuntimeLibrary="3"
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -165,8 +165,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,19 +386,97 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-		<File
-			RelativePath="..\example\demo_portable_archive.cpp">
-		</File>
-		<File
-			RelativePath="..\example\portable_binary_iarchive.hpp">
-		</File>
-		<File
-			RelativePath="..\example\portable_binary_oarchive.hpp">
-		</File>
+		<Filter
+			Name="Headers"
+			Filter="">
+			<File
+				RelativePath="..\example\portable_binary_archive.hpp">
+			</File>
+			<File
+				RelativePath="..\example\portable_binary_iarchive.hpp">
+			</File>
+			<File
+				RelativePath="..\example\portable_binary_oarchive.hpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Source"
+			Filter="">
+			<File
+				RelativePath="..\example\demo_portable_archive.cpp">
+			</File>
+			<File
+				RelativePath="..\example\portable_binary_iarchive.cpp">
+			</File>
+			<File
+				RelativePath="..\example\portable_binary_oarchive.cpp">
+			</File>
+		</Filter>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/demo_shared_ptr.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_shared_ptr.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_shared_ptr.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +386,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/demo_xml.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_xml.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_xml.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +386,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/demo_xml_load.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_xml_load.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_xml_load.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +386,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/demo_xml_save.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/demo_xml_save.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/demo_xml_save.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -45,7 +45,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -74,7 +74,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -105,7 +105,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -134,7 +134,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/debug/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -166,7 +166,7 @@
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -195,7 +195,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -230,7 +230,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -261,7 +261,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1"
                         CharacterSet="0">
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 OptimizeReferences="1"
@@ -327,8 +327,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/example/$(ProjectName).exe/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/example/$(ProjectName).exe/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -358,8 +358,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
-				DelayLoadDLLs="$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -386,6 +386,67 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800 /Ob0"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				DelayLoadDLLs="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_array.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_array.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_array.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -21,7 +21,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=text_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_archive.hpp"
                                 RuntimeLibrary="3"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1341,7 +1341,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=binary_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_DYN_LINK=1"
                                 RuntimeLibrary="3"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1394,7 +1394,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=binary_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ARCHIVE_TEST=binary_archive.hpp"
                                 RuntimeLibrary="5"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,15 +1661,60 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeTypeInfo="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
                 <File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
                         RelativePath="..\test\A.hpp">
                 </File>
                 <File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
                         RelativePath="..\test\test_array.cpp">
+			<FileConfiguration
+				Name="Debug runtime-dynamic threading-multi|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"/>
+			</FileConfiguration>
                 </File>
         </Files>
         <Globals>

Modified: branches/release/libs/serialization/vc7ide/test_binary.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_binary.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_binary.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_class_info_load.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_class_info_load.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_class_info_load.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_class_info_save.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_class_info_save.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_class_info_save.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_codecvt_null.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_codecvt_null.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_codecvt_null.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,8 +66,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -95,7 +95,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.dll/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/libboost_serialization.dll/msvc-7.1/release/link-dynamic/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -152,7 +152,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -180,8 +180,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -209,7 +209,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -237,8 +237,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -262,7 +262,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -290,8 +290,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -315,7 +315,60 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool

Modified: branches/release/libs/serialization/vc7ide/test_const.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_const.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_const.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -12,8 +12,8 @@
         <Configurations>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -33,7 +33,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/&quot;"/>
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;;abcd/&quot;"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -57,8 +57,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -96,7 +96,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -161,7 +161,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;abcd&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -187,8 +187,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -225,7 +225,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;abcd&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -251,8 +251,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -290,7 +290,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;;abcd/&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -317,8 +317,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -356,7 +356,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>

Modified: branches/release/libs/serialization/vc7ide/test_const_fail.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_const_fail.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_const_fail.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -2,7 +2,7 @@
 <VisualStudioProject
         ProjectType="Visual C++"
         Version="7.10"
-	Name="test_const_fail"
+	Name="test_const_warn"
         ProjectGUID="{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
         Keyword="Win32Proj">
         <Platforms>
@@ -12,8 +12,8 @@
         <Configurations>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -33,7 +33,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/&quot;"/>
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;;abcd/&quot;"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -57,8 +57,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -96,7 +96,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -161,7 +161,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;abcd&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -187,8 +187,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -225,7 +225,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;abcd&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -251,8 +251,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -290,7 +290,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;;abcd/&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -317,8 +317,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -356,7 +356,73 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;  &gt; &quot;$(TargetDir)/$(TargetName).output&quot;  2&gt;&amp;1
+set status=%ERRORLEVEL%
+echo.  &gt;&gt; &quot;$(TargetDir)/$(TargetName).output&quot;
+echo EXIT STATUS: %status%  &gt;&gt; &quot;$(TargetDir)/$(TargetName).output&quot;
+if %status% EQU 0 (
+copy  &quot;$(TargetDir)/$(TargetName).output&quot;  &quot;$(TargetDir)/$(TargetName).run&quot;
+)
+"
+				Outputs="&quot;$(TargetDir)$(TargetName).output&quot;"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -404,22 +470,22 @@
                         RelativePath="..\test\test_const_load_fail3_nvp.cpp">
                 </File>
                 <File
-			RelativePath="..\test\test_const_save_fail1.cpp">
+			RelativePath="..\test\test_const_save_warn1.cpp">
                 </File>
                 <File
-			RelativePath="..\test\test_const_save_fail1_nvp.cpp">
+			RelativePath="..\test\test_const_save_warn1_nvp.cpp">
                 </File>
                 <File
-			RelativePath="..\test\test_const_save_fail2.cpp">
+			RelativePath="..\test\test_const_save_warn2.cpp">
                 </File>
                 <File
-			RelativePath="..\test\test_const_save_fail2_nvp.cpp">
+			RelativePath="..\test\test_const_save_warn2_nvp.cpp">
                 </File>
                 <File
-			RelativePath="..\test\test_const_save_fail3.cpp">
+			RelativePath="..\test\test_const_save_warn3.cpp">
                 </File>
                 <File
-			RelativePath="..\test\test_const_save_fail3_nvp.cpp">
+			RelativePath="..\test\test_const_save_warn3_nvp.cpp">
                 </File>
         </Files>
         <Globals>

Modified: branches/release/libs/serialization/vc7ide/test_const_pass.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_const_pass.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_const_pass.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -12,8 +12,8 @@
         <Configurations>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -33,7 +33,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/&quot;"/>
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;;abcd/&quot;"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -57,8 +57,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -96,7 +96,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -161,7 +161,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;abcd&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -187,8 +187,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -225,7 +225,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;abcd&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -251,8 +251,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -290,7 +290,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;;abcd/&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
@@ -317,8 +317,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -356,7 +356,73 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;  &gt; &quot;$(TargetDir)/$(TargetName).output&quot;  2&gt;&amp;1
+set status=%ERRORLEVEL%
+echo.  &gt;&gt; &quot;$(TargetDir)/$(TargetName).output&quot;
+echo EXIT STATUS: %status%  &gt;&gt; &quot;$(TargetDir)/$(TargetName).output&quot;
+if %status% EQU 0 (
+copy  &quot;$(TargetDir)/$(TargetName).output&quot;  &quot;$(TargetDir)/$(TargetName).run&quot;
+)
+"
+				Outputs="&quot;$(TargetDir)$(TargetName).output&quot;"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 TargetMachine="1"/>

Modified: branches/release/libs/serialization/vc7ide/test_contained_class.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_contained_class.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_contained_class.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,38 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_cyclic_ptrs.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_cyclic_ptrs.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_cyclic_ptrs.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,16 +1661,52 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_cyclic_ptrs.cpp">
-              </File>
-              <File
-                     RelativePath="..\test\A.hpp">
-              </File>
+		<File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
+			RelativePath="..\test\A.hpp">
+		</File>
+		<File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
+			RelativePath="..\test\test_cyclic_ptrs.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_delete_pointer.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_delete_pointer.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_delete_pointer.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_deque.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_deque.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_deque.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,16 +1661,53 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_deque.cpp">
-              </File>
-              <File
-                     RelativePath="..\test\A.hpp">
-              </File>
+		<File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
+			RelativePath="..\test\A.hpp">
+		</File>
+		<File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
+			RelativePath="..\test\test_deque.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_derived.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_derived.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_derived.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,45 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_derived.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_derived.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_derived_class.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_derived_class.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_derived_class.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,11 +1661,46 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
                 <File
+			RelativePath="..\test\B.hpp">
+		</File>
+		<File
                         RelativePath="..\test\test_derived_class.cpp">
                 </File>
         </Files>

Modified: branches/release/libs/serialization/vc7ide/test_derived_class_ptr.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_derived_class_ptr.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_derived_class_ptr.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_diamond.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_diamond.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_diamond.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,45 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_diamond.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_diamond.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_exported.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_exported.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_exported.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -185,7 +185,7 @@
                                 OmitFramePointers="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
                                 PreprocessorDefinitions="WIN32;_CONSOLE;BOOST_ARCHIVE_TEST=text_archive.hpp"
-				RuntimeLibrary="2"
+				RuntimeLibrary="4"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
                                 TreatWChar_tAsBuiltInType="TRUE"
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -241,7 +241,7 @@
                                 FavorSizeOrSpeed="1"
                                 OmitFramePointers="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=text_archive.hpp"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=text_archive.hpp"
                                 RuntimeLibrary="4"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -249,7 +249,7 @@
                                 ForceConformanceInForLoopScope="TRUE"
                                 RuntimeTypeInfo="TRUE"
                                 WarningLevel="3"
-				DebugInformationFormat="1"
+				DebugInformationFormat="0"
                                 CompileAs="0"/>
                         <Tool
                                 Name="VCCustomBuildTool"/>
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1341,7 +1341,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=binary_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_DYN_LINK=1;BOOST_ARCHIVE_TEST=binary_archive.hpp"
                                 RuntimeLibrary="3"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1394,7 +1394,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=binary_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ARCHIVE_TEST=binary_archive.hpp"
                                 RuntimeLibrary="5"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,53 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_inclusion.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_inclusion.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_inclusion.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -12,8 +12,8 @@
         <Configurations>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -57,8 +57,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -187,8 +187,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -251,8 +251,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool
@@ -317,8 +317,74 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			ConfigurationType="1"
+			CharacterSet="0">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm800"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="FALSE"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;  &gt; &quot;$(TargetDir)/$(TargetName).output&quot;  2&gt;&amp;1
+set status=%ERRORLEVEL%
+echo.  &gt;&gt; &quot;$(TargetDir)/$(TargetName).output&quot;
+echo EXIT STATUS: %status%  &gt;&gt; &quot;$(TargetDir)/$(TargetName).output&quot;
+if %status% EQU 0 (
+copy  &quot;$(TargetDir)/$(TargetName).output&quot;  &quot;$(TargetDir)/$(TargetName).run&quot;
+)
+"
+				Outputs="&quot;$(TargetDir)$(TargetName).output&quot;"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="0">
                         <Tool

Modified: branches/release/libs/serialization/vc7ide/test_iterators.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_iterators.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_iterators.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -66,8 +66,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -180,8 +180,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -237,8 +237,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -290,8 +290,61 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -345,9 +398,9 @@
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_iterators.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_iterators.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_iterators_base64.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_iterators_base64.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_iterators_base64.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -66,8 +66,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -180,8 +180,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -237,8 +237,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -290,8 +290,61 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -345,9 +398,9 @@
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_iterators_base64.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_iterators_base64.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_list.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_list.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_list.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,14 +1661,50 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
                 <File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
                         RelativePath="..\test\A.hpp">
                 </File>
                 <File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
                         RelativePath="..\test\test_list.cpp">
                 </File>
         </Files>

Modified: branches/release/libs/serialization/vc7ide/test_list_ptrs.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_list_ptrs.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_list_ptrs.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,14 +1661,50 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
                 <File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
                         RelativePath="..\test\A.hpp">
                 </File>
                 <File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
                         RelativePath="..\test\test_list_ptrs.cpp">
                 </File>
         </Files>

Modified: branches/release/libs/serialization/vc7ide/test_map.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_map.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_map.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,16 +1661,52 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_map.cpp">
-              </File>
-              <File
-                     RelativePath="..\test\A.hpp">
-              </File>
+		<File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
+			RelativePath="..\test\A.hpp">
+		</File>
+		<File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
+			RelativePath="..\test\test_map.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_mi.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_mi.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_mi.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,43 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_mi.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_mi.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_mult_archive_types.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_mult_archive_types.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_mult_archive_types.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,8 +66,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -95,7 +95,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.dll/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/libboost_serialization.dll/msvc-7.1/release/link-dynamic/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -152,7 +152,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -180,8 +180,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -209,7 +209,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -237,8 +237,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -262,7 +262,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -290,8 +290,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -315,7 +315,60 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool

Modified: branches/release/libs/serialization/vc7ide/test_multiple_ptrs.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_multiple_ptrs.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_multiple_ptrs.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_no_rtti.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_no_rtti.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_no_rtti.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,57 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_no_rtti.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_no_rtti.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_non_default_ctor.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_non_default_ctor.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_non_default_ctor.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,44 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_non_default_ctor.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_non_default_ctor.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_non_default_ctor2.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_non_default_ctor2.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_non_default_ctor2.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,43 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_non_default_ctor2.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_non_default_ctor2.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_non_intrusive.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_non_intrusive.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_non_intrusive.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,43 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_non_intrusive.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_non_intrusive.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_not_serializable.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_not_serializable.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_not_serializable.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -30,7 +30,7 @@
                                 ForceConformanceInForLoopScope="TRUE"
                                 RuntimeTypeInfo="TRUE"
                                 UsePrecompiledHeader="0"
-				ObjectFile="$(ProjectDir)../example/bin/$(InputName).exe/vc7/$(OutDir)/runtime-link-static/$(InputName).obj"
+				ObjectFile="$(ProjectDir)../example/bin.v2/$(InputName).exe/vc7/$(OutDir)/link-static/$(InputName).obj"
                                 WarningLevel="3"
                                 Detect64BitPortabilityProblems="FALSE"
                                 DebugInformationFormat="4"/>
@@ -84,7 +84,7 @@
                                 ForceConformanceInForLoopScope="TRUE"
                                 RuntimeTypeInfo="TRUE"
                                 UsePrecompiledHeader="0"
-				ObjectFile="$(ProjectDir)../example/bin/$(InputName).exe/vc7/$(OutDir)/runtime-link-static/$(InputName).obj"
+				ObjectFile="$(ProjectDir)../example/bin.v2/$(InputName).exe/vc7/$(OutDir)/link-static/$(InputName).obj"
                                 WarningLevel="3"
                                 Detect64BitPortabilityProblems="FALSE"
                                 DebugInformationFormat="3"/>
@@ -120,6 +120,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_null_ptr.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_null_ptr.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_null_ptr.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_nvp.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_nvp.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_nvp.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,43 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_nvp.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_nvp.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_object.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_object.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_object.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_optional.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_optional.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_optional.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,52 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeTypeInfo="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_optional.cpp">
-              </File>
+		<File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
+			RelativePath="..\test\test_optional.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_polymorphic.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_polymorphic.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_polymorphic.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1341,7 +1341,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=polymorphic_binary_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_DYN_LINK=1;BOOST_ARCHIVE_TEST=polymorphic_binary_archive.hpp"
                                 RuntimeLibrary="3"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1447,7 +1447,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=polymorphic_binary_archive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ARCHIVE_TEST=polymorphic_binary_archive.hpp"
                                 RuntimeLibrary="1"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\bin.v2\libs\serialization\build\msvc-7.1\debug\link-static\threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,14 +1661,50 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
                 <File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
                         RelativePath="..\test\A.hpp">
                 </File>
                 <File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
                         RelativePath="..\test\test_polymorphic.cpp">
                 </File>
                 <File

Modified: branches/release/libs/serialization/vc7ide/test_primitive.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_primitive.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_primitive.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_private_ctor.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_private_ctor.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_private_ctor.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,8 +66,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -95,7 +95,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.dll/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/libboost_serialization.dll/msvc-7.1/release/link-dynamic/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -152,7 +152,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -180,8 +180,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -209,7 +209,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -237,8 +237,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -262,7 +262,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -290,8 +290,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -315,7 +315,60 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool

Modified: branches/release/libs/serialization/vc7ide/test_recursion.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_recursion.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_recursion.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_recusion.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_recusion.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_recusion.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool

Modified: branches/release/libs/serialization/vc7ide/test_registered.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_registered.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_registered.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_reset_object_addr.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_reset_object_addr.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_reset_object_addr.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -39,7 +39,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/hreading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/hreading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -67,8 +67,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -96,7 +96,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.dll/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/libboost_serialization.dll/msvc-7.1/release/link-dynamic/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -124,8 +124,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -153,7 +153,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -181,8 +181,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -210,7 +210,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -238,8 +238,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -263,7 +263,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -291,8 +291,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -316,7 +316,60 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -347,6 +400,12 @@
         </References>
         <Files>
                 <File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
                         RelativePath="..\test\test_reset_object_address.cpp">
                 </File>
         </Files>

Modified: branches/release/libs/serialization/vc7ide/test_set.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_set.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_set.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,37 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_shared_ptr.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_shared_ptr.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_shared_ptr.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_shared_ptr_132.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_shared_ptr_132.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_shared_ptr_132.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,70 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-		<File
-			RelativePath="..\..\..\boost\serialization\detail\shared_count_132.hpp">
-		</File>
+		<Filter
+			Name="OriginalSharePtr"
+			Filter="">
+			<File
+				RelativePath="..\..\..\boost\serialization\detail\shared_count_132.hpp">
+			</File>
+			<File
+				RelativePath="..\..\..\boost\serialization\detail\shared_ptr_132.hpp">
+			</File>
+			<File
+				RelativePath="..\..\..\boost\serialization\detail\shared_ptr_nmt_132.hpp">
+			</File>
+		</Filter>
                 <File
                         RelativePath="..\..\..\boost\serialization\shared_ptr.hpp">
                 </File>
@@ -1675,12 +1732,6 @@
                         RelativePath="..\..\..\boost\serialization\shared_ptr_132.hpp">
                 </File>
                 <File
-			RelativePath="..\..\..\boost\serialization\detail\shared_ptr_132.hpp">
-		</File>
-		<File
-			RelativePath="..\..\..\boost\serialization\detail\shared_ptr_nmt_132.hpp">
-		</File>
-		<File
                         RelativePath="..\test\test_shared_ptr_132.cpp">
                 </File>
         </Files>

Modified: branches/release/libs/serialization/vc7ide/test_simple_class.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_simple_class.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_simple_class.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -21,7 +21,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions=" BOOST_LIB_DIAGNOSTIC=1;WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=text_archive.hpp"
+				PreprocessorDefinitions="BOOST_LIB_DIAGNOSTIC=1;WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=text_archive.hpp"
                                 RuntimeLibrary="3"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -75,7 +75,7 @@
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=text_archive.hpp"
-				RuntimeLibrary="3"
+				RuntimeLibrary="5"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
                                 TreatWChar_tAsBuiltInType="TRUE"
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_unit_test_framework.lib/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -242,7 +242,7 @@
                                 OmitFramePointers="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=text_archive.hpp"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
                                 TreatWChar_tAsBuiltInType="TRUE"
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.dll/vc-7_1/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/libboost_serialization.dll/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/libboost_serialization.dll/msvc-7.1/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1011,7 +1011,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ARCHIVE_TEST=xml_warchive.hpp"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_DYN_LINK=1;BOOST_LIB_DIAGNOSTIC=1;BOOST_ARCHIVE_TEST=xml_warchive.hpp"
                                 RuntimeLibrary="3"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,14 +1661,55 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_DYN_LINK=1;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
                 <File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
                         RelativePath="..\test\A.hpp">
                 </File>
                 <File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
                         RelativePath="..\test\test_simple_class.cpp">
                 </File>
         </Files>

Modified: branches/release/libs/serialization/vc7ide/test_simple_class_ptr.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_simple_class_ptr.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_simple_class_ptr.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,14 +1661,50 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
                 <File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
                         RelativePath="..\test\A.hpp">
                 </File>
                 <File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
                         RelativePath="..\test\test_simple_class_ptr.cpp">
                 </File>
         </Files>

Modified: branches/release/libs/serialization/vc7ide/test_smart_cast.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_smart_cast.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_smart_cast.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,8 +66,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -180,8 +180,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -237,8 +237,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -290,8 +290,61 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"

Modified: branches/release/libs/serialization/vc7ide/test_split.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_split.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_split.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,43 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_split.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_split.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_static_warning.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_static_warning.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_static_warning.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,8 +66,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -180,8 +180,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -237,8 +237,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -290,8 +290,61 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"

Modified: branches/release/libs/serialization/vc7ide/test_tracking.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_tracking.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_tracking.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_traits_fail.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_traits_fail.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_traits_fail.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -12,8 +12,8 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -45,7 +45,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -71,8 +71,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -109,7 +109,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;abcd&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -135,8 +135,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -173,7 +173,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static/&quot;;abcd/&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -199,8 +199,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -237,7 +237,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;abcd&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -263,8 +263,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -296,7 +296,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static/&quot;;abcd/&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -322,8 +322,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -355,7 +355,66 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;  &gt; &quot;$(TargetDir)/$(TargetName).output&quot;  2&gt;&amp;1
+set status=%ERRORLEVEL%
+echo.  &gt;&gt; &quot;$(TargetDir)/$(TargetName).output&quot;
+echo EXIT STATUS: %status%  &gt;&gt; &quot;$(TargetDir)/$(TargetName).output&quot;
+if %status% EQU 0 (
+copy  &quot;$(TargetDir)/$(TargetName).output&quot;  &quot;$(TargetDir)/$(TargetName).run&quot;
+)
+"
+				Outputs="&quot;$(TargetDir)$(TargetName).output&quot;"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool

Modified: branches/release/libs/serialization/vc7ide/test_traits_pass.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_traits_pass.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_traits_pass.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,8 +66,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -95,7 +95,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.dll/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/libboost_serialization.dll/msvc-7.1/release/link-dynamic/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -123,8 +123,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -152,7 +152,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -180,8 +180,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -209,7 +209,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-dynamic&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -237,8 +237,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -262,7 +262,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -290,8 +290,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -315,7 +315,60 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-dynamic/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -345,9 +398,9 @@
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_traits_pass.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_traits_pass.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_unregistered.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_unregistered.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_unregistered.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,6 +1661,36 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>

Modified: branches/release/libs/serialization/vc7ide/test_utf8_codecvt.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_utf8_codecvt.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_utf8_codecvt.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -67,8 +67,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -124,8 +124,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -181,8 +181,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -238,8 +238,8 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -291,8 +291,61 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"

Modified: branches/release/libs/serialization/vc7ide/test_variant.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_variant.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_variant.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,13 +1661,43 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_variant.cpp">
-              </File>
+		<File
+			RelativePath="..\test\test_variant.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_vector.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_vector.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_vector.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -38,7 +38,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -66,7 +66,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -91,7 +91,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -119,7 +119,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -144,7 +144,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -172,7 +172,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -201,7 +201,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -229,7 +229,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -258,7 +258,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -286,7 +286,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -315,7 +315,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -343,7 +343,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -368,7 +368,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -396,7 +396,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -421,7 +421,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -449,7 +449,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -474,7 +474,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -502,7 +502,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -531,7 +531,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -559,7 +559,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -588,7 +588,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -616,7 +616,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi text_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_text_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_text_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -645,7 +645,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -673,7 +673,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -698,7 +698,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -726,7 +726,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -751,7 +751,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -779,7 +779,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -804,7 +804,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -832,7 +832,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -861,7 +861,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -889,7 +889,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -918,7 +918,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -946,7 +946,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -975,7 +975,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1003,7 +1003,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1028,7 +1028,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1056,7 +1056,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1081,7 +1081,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1109,7 +1109,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1134,7 +1134,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1162,7 +1162,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1191,7 +1191,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1219,7 +1219,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1248,7 +1248,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1276,7 +1276,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi xml_warchive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_xml_warchive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_xml_warchive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1305,7 +1305,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1333,7 +1333,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1358,7 +1358,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1386,7 +1386,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1411,7 +1411,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1439,7 +1439,7 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1464,7 +1464,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories=";&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -1492,7 +1492,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1521,7 +1521,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_wserialization.dll/vc-7_1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1549,7 +1549,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/link-static/&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1578,7 +1578,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1606,7 +1606,7 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi binary_archive|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName)_binary_archive.test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName)_binary_archive.test/msvc-7.1/release/threading-multi/link-static&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -1635,7 +1635,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_wserialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-static/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi/link-static&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -1661,16 +1661,52 @@
                         <Tool
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
                 </Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
         </Configurations>
         <References>
         </References>
         <Files>
-              <File
-                     RelativePath="..\test\test_vector.cpp">
-              </File>
-              <File
-                     RelativePath="..\test\A.hpp">
-              </File>
+		<File
+			RelativePath="..\test\A.cpp">
+		</File>
+		<File
+			RelativePath="..\test\A.hpp">
+		</File>
+		<File
+			RelativePath="..\test\A.ipp">
+		</File>
+		<File
+			RelativePath="..\test\test_vector.cpp">
+		</File>
         </Files>
         <Globals>
         </Globals>

Modified: branches/release/libs/serialization/vc7ide/test_void_cast.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_void_cast.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_void_cast.vcproj	2008-06-26 15:25:44 EDT (Thu, 26 Jun 2008)
@@ -13,7 +13,7 @@
         <Configurations>
                 <Configuration
                         Name="Debug runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi&quot;"
                         IntermediateDirectory="$(OutDir)"
                         ConfigurationType="1">
                         <Tool
@@ -21,7 +21,7 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
-				PreprocessorDefinitions="BOOST_LIB_DIAGNOSTIC=1"
+				PreprocessorDefinitions="BOOST_ALL_DYN_LINK=1;BOOST_LIB_DIAGNOSTIC=1"
                                 RuntimeLibrary="3"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -39,7 +39,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/debug/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -67,8 +67,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -79,7 +79,7 @@
                                 FavorSizeOrSpeed="1"
                                 OmitFramePointers="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1"
                                 RuntimeLibrary="0"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -96,7 +96,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.dll/vc-7_1/release/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="abcd/link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/libboost_serialization.dll/msvc-7.1/release/link-dynamic/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -124,8 +124,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -136,7 +136,7 @@
                                 FavorSizeOrSpeed="1"
                                 OmitFramePointers="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1"
                                 RuntimeLibrary="4"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -153,7 +153,8 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/link-static&quot;"
+				GenerateDebugInformation="FALSE"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -181,8 +182,8 @@
                 </Configuration>
                 <Configuration
                         Name="Release runtime-dynamic|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/release/threading-multi/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/release/threading-multi&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -193,8 +194,8 @@
                                 FavorSizeOrSpeed="1"
                                 OmitFramePointers="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1"
+				RuntimeLibrary="0"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
                                 TreatWChar_tAsBuiltInType="TRUE"
@@ -210,7 +211,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/release/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/boost_serialization.dll/vc-7_1/release/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/release/threading-multi&quot;"
                                 SubSystem="1"
                                 TargetMachine="1"/>
                         <Tool
@@ -238,14 +239,15 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/link-static/&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="BOOST_LIB_DIAGNOSTIC=1"
                                 RuntimeLibrary="5"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
@@ -263,7 +265,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic&quot;"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/link-static&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool
@@ -291,16 +293,72 @@
                 </Configuration>
                 <Configuration
                         Name="Debug runtime-static threading-multi|Win32"
-			OutputDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
-			IntermediateDirectory="&quot;$(ProjectDir)../../../bin/boost/libs/serialization/test/$(ProjectName).test/vc-7_1/debug/runtime-link-static/threading-multi&quot;"
+			OutputDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
+			IntermediateDirectory="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/test/$(ProjectName).test/msvc-7.1/debug/threading-multi/link-static&quot;"
                         ConfigurationType="1">
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				BasicRuntimeChecks="3"
                                 RuntimeLibrary="1"
-				BufferSecurityCheck="FALSE"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin.v2/libs/serialization/build/msvc-7.1/debug/threading-multi/link-static&quot;"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="run $(TargetName) with $(ConfigurationName)"
+				CommandLine="&quot;$(TargetDir)/$(TargetName).exe&quot;"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug runtime-dynamic threading-multi|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
                                 EnableFunctionLevelLinking="TRUE"
                                 TreatWChar_tAsBuiltInType="TRUE"
                                 ForceConformanceInForLoopScope="TRUE"
@@ -316,7 +374,7 @@
                                 IgnoreImportLibrary="TRUE"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../../bin/boost/libs/test/build/libboost_test_exec_monitor.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;;&quot;$(ProjectDir)../../../bin/boost/libs/serialization/build/libboost_serialization.lib/vc-7_1/debug/runtime-link-dynamic/threading-multi&quot;"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="1"/>
                         <Tool