diff -r 8a5f9c8b6fb3 boost/boost/config/compiler/visualc.hpp --- a/boost/boost/config/compiler/visualc.hpp Mon Jul 01 12:00:29 2013 +0800 +++ b/boost/boost/config/compiler/visualc.hpp Mon Jul 01 12:04:06 2013 +0800 @@ -276,6 +276,8 @@ # define BOOST_COMPILER_VERSION evc10 # elif _MSC_VER < 1800 # define BOOST_COMPILER_VERSION evc11 +# elif _MSC_VER < 1900 +# define BOOST_COMPILER_VERSION evc12 # else # if defined(BOOST_ASSERT_CONFIG) # error "Unknown EVC++ compiler version - please run the configure tests and report the results" @@ -301,6 +303,8 @@ # define BOOST_COMPILER_VERSION 10.0 # elif _MSC_VER < 1800 # define BOOST_COMPILER_VERSION 11.0 +# elif _MSC_VER < 1900 +# define BOOST_COMPILER_VERSION 12.0 # else # define BOOST_COMPILER_VERSION _MSC_VER # endif @@ -310,8 +314,8 @@ #endif // -// last known and checked version is 1700 (VC11, aka 2011): -#if (_MSC_VER > 1700) +// last known and checked version is 1800 (VC12, aka 2013): +#if (_MSC_VER > 1800) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff -r 8a5f9c8b6fb3 boost/tools/build/v2/tools/msvc.jam --- a/boost/tools/build/v2/tools/msvc.jam Mon Jul 01 12:00:29 2013 +0800 +++ b/boost/tools/build/v2/tools/msvc.jam Mon Jul 01 12:04:06 2013 +0800 @@ -738,7 +738,11 @@ # version from the path. # FIXME: We currently detect both Microsoft Visual Studio 9.0 and # 9.0express as 9.0 here. - if [ MATCH "(Microsoft Visual Studio 11)" : $(command) ] + if [ MATCH "(Microsoft Visual Studio 12)" : $(command) ] + { + version = 12.0 ; + } + else if [ MATCH "(Microsoft Visual Studio 11)" : $(command) ] { version = 11.0 ; } @@ -1364,7 +1368,7 @@ # Known toolset versions, in order of preference. -.known-versions = 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ; +.known-versions = 12.0 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ; # Version aliases. .version-alias-6 = 6.0 ; @@ -1374,6 +1378,7 @@ .version-alias-9 = 9.0 ; .version-alias-10 = 10.0 ; .version-alias-11 = 11.0 ; +.version-alias-12 = 12.0 ; # Names of registry keys containing the Visual C++ installation path (relative # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft"). @@ -1387,6 +1392,7 @@ .version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ; .version-10.0express-reg = "VCExpress\\10.0\\Setup\\VC" ; .version-11.0-reg = "VisualStudio\\11.0\\Setup\\VC" ; +.version-12.0-reg = "VisualStudio\\12.0\\Setup\\VC" ; # Visual C++ Toolkit 2003 does not store its installation path in the registry. # The environment variable 'VCToolkitInstallDir' and the default installation