Added support for VS2017 version 15.3.4.

This commit is contained in:
LoRd_MuldeR 2017-09-15 20:37:09 +02:00
parent d5a84818c0
commit 987685f080

View File

@ -49,86 +49,87 @@ namespace MUtils
//Compiler detection
static const char *const compiler_version(void)
{
static const char *const COMPILER_VERS =
#if defined(__INTEL_COMPILER)
#if (__INTEL_COMPILER >= 1500)
static const char *const COMPILER_VERS = "ICL 15." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
"ICL 15." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
#elif (__INTEL_COMPILER >= 1400)
static const char *const COMPILER_VERS = "ICL 14." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
"ICL 14." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
#elif (__INTEL_COMPILER >= 1300)
static const char *const COMPILER_VERS = "ICL 13." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
"ICL 13." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
#elif (__INTEL_COMPILER >= 1200)
static const char *const COMPILER_VERS = "ICL 12." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
"ICL 12." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE);
#elif (__INTEL_COMPILER >= 1100)
static const char *const COMPILER_VERS = "ICL 11.x";
"ICL 11.x";
#elif (__INTEL_COMPILER >= 1000)
static const char *const COMPILER_VERS = "ICL 10.x";
"ICL 10.x";
#else
#error Compiler is not supported!
#endif
#elif defined(_MSC_VER)
#if (_MSC_VER == 1911)
#if (_MSC_FULL_VER == 191125506)
static const char *const COMPILER_VERS = "MSVC 2017.3";
#if((_MSC_FULL_VER == 191125508) || (_MSC_FULL_VER == 191125506))
"MSVC 2017.3";
#else
#error Compiler version is not supported yet!
#endif
#elif (_MSC_VER == 1910)
#if ((_MSC_FULL_VER >= 191025017) && (_MSC_FULL_VER <= 191025019))
static const char *const COMPILER_VERS = "MSVC 2017.2";
"MSVC 2017.2";
#else
#error Compiler version is not supported yet!
#endif
#elif (_MSC_VER == 1900)
#if (_MSC_FULL_VER == 190023026)
static const char *const COMPILER_VERS = "MSVC 2015";
"MSVC 2015";
#elif (_MSC_FULL_VER == 190023506)
static const char *const COMPILER_VERS = "MSVC 2015.1";
"MSVC 2015.1";
#elif (_MSC_FULL_VER == 190023918)
static const char *const COMPILER_VERS = "MSVC 2015.2";
"MSVC 2015.2";
#elif (_MSC_FULL_VER == 190024210) || (_MSC_FULL_VER == 190024215)
static const char *const COMPILER_VERS = "MSVC 2015.3";
"MSVC 2015.3";
#else
#error Compiler version is not supported yet!
#endif
#elif (_MSC_VER == 1800)
#if (_MSC_FULL_VER == 180021005)
static const char *const COMPILER_VERS = "MSVC 2013";
"MSVC 2013";
#elif (_MSC_FULL_VER == 180030501)
static const char *const COMPILER_VERS = "MSVC 2013.2";
"MSVC 2013.2";
#elif (_MSC_FULL_VER == 180030723)
static const char *const COMPILER_VERS = "MSVC 2013.3";
"MSVC 2013.3";
#elif (_MSC_FULL_VER == 180031101)
static const char *const COMPILER_VERS = "MSVC 2013.4";
"MSVC 2013.4";
#elif (_MSC_FULL_VER == 180040629)
static const char *const COMPILER_VERS = "MSVC 2013.5";
"MSVC 2013.5";
#else
#error Compiler version is not supported yet!
#endif
#elif (_MSC_VER == 1700)
#if (_MSC_FULL_VER == 170050727)
static const char *const COMPILER_VERS = "MSVC 2012";
"MSVC 2012";
#elif (_MSC_FULL_VER == 170051106)
static const char *const COMPILER_VERS = "MSVC 2012.1";
"MSVC 2012.1";
#elif (_MSC_FULL_VER == 170060315)
static const char *const COMPILER_VERS = "MSVC 2012.2";
"MSVC 2012.2";
#elif (_MSC_FULL_VER == 170060610)
static const char *const COMPILER_VERS = "MSVC 2012.3";
"MSVC 2012.3";
#elif (_MSC_FULL_VER == 170061030)
static const char *const COMPILER_VERS = "MSVC 2012.4";
"MSVC 2012.4";
#else
#error Compiler version is not supported yet!
#endif
#elif (_MSC_VER == 1600)
#if (_MSC_FULL_VER >= 160040219)
static const char *const COMPILER_VERS = "MSVC 2010-SP1";
"MSVC 2010-SP1";
#else
static const char *const COMPILER_VERS = "MSVC 2010";
"MSVC 2010";
#endif
#elif (_MSC_VER == 1500)
#if (_MSC_FULL_VER >= 150030729)
static const char *const COMPILER_VERS = "MSVC 2008-SP1";
"MSVC 2008-SP1";
#else
static const char *const COMPILER_VERS = "MSVC 2008";
"MSVC 2008";
#endif
#else
#error Compiler is not supported!
@ -136,21 +137,20 @@ namespace MUtils
#else
#error Compiler is not supported!
#endif
return COMPILER_VERS;
}
//Architecture detection
static const char *const compiler_arch(void)
{
static const char *const COMPILER_ARCH =
#if defined(_M_X64)
static const char *const COMPILER_ARCH = "x64";
"x64";
#elif defined(_M_IX86)
static const char *const COMPILER_ARCH = "x86";
"x86";
#else
#error Architecture is not supported!
#endif
return COMPILER_ARCH;
}