From 987685f080e43b1847167132e098164b71fd5ae7 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Fri, 15 Sep 2017 20:37:09 +0200 Subject: [PATCH] Added support for VS2017 version 15.3.4. --- include/MUtils/Version.h | 178 +++++++++++++++++++++++------------------------ 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/include/MUtils/Version.h b/include/MUtils/Version.h index d432bdc..62e497c 100644 --- a/include/MUtils/Version.h +++ b/include/MUtils/Version.h @@ -49,108 +49,108 @@ namespace MUtils //Compiler detection static const char *const compiler_version(void) { - #if defined(__INTEL_COMPILER) - #if (__INTEL_COMPILER >= 1500) - static const char *const COMPILER_VERS = "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); - #elif (__INTEL_COMPILER >= 1300) - static const char *const COMPILER_VERS = "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); - #elif (__INTEL_COMPILER >= 1100) - static const char *const COMPILER_VERS = "ICL 11.x"; - #elif (__INTEL_COMPILER >= 1000) - static const char *const COMPILER_VERS = "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"; - #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"; - #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"; - #elif (_MSC_FULL_VER == 190023506) - static const char *const COMPILER_VERS = "MSVC 2015.1"; - #elif (_MSC_FULL_VER == 190023918) - static const char *const COMPILER_VERS = "MSVC 2015.2"; - #elif (_MSC_FULL_VER == 190024210) || (_MSC_FULL_VER == 190024215) - static const char *const COMPILER_VERS = "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"; - #elif (_MSC_FULL_VER == 180030501) - static const char *const COMPILER_VERS = "MSVC 2013.2"; - #elif (_MSC_FULL_VER == 180030723) - static const char *const COMPILER_VERS = "MSVC 2013.3"; - #elif (_MSC_FULL_VER == 180031101) - static const char *const COMPILER_VERS = "MSVC 2013.4"; - #elif (_MSC_FULL_VER == 180040629) - static const char *const COMPILER_VERS = "MSVC 2013.5"; + static const char *const COMPILER_VERS = + #if defined(__INTEL_COMPILER) + #if (__INTEL_COMPILER >= 1500) + "ICL 15." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE); + #elif (__INTEL_COMPILER >= 1400) + "ICL 14." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE); + #elif (__INTEL_COMPILER >= 1300) + "ICL 13." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE); + #elif (__INTEL_COMPILER >= 1200) + "ICL 12." MUTILS_MAKE_STRING(__INTEL_COMPILER_BUILD_DATE); + #elif (__INTEL_COMPILER >= 1100) + "ICL 11.x"; + #elif (__INTEL_COMPILER >= 1000) + "ICL 10.x"; #else - #error Compiler version is not supported yet! + #error Compiler is not supported! #endif - #elif (_MSC_VER == 1700) - #if (_MSC_FULL_VER == 170050727) - static const char *const COMPILER_VERS = "MSVC 2012"; - #elif (_MSC_FULL_VER == 170051106) - static const char *const COMPILER_VERS = "MSVC 2012.1"; - #elif (_MSC_FULL_VER == 170060315) - static const char *const COMPILER_VERS = "MSVC 2012.2"; - #elif (_MSC_FULL_VER == 170060610) - static const char *const COMPILER_VERS = "MSVC 2012.3"; - #elif (_MSC_FULL_VER == 170061030) - static const char *const COMPILER_VERS = "MSVC 2012.4"; + #elif defined(_MSC_VER) + #if (_MSC_VER == 1911) + #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)) + "MSVC 2017.2"; + #else + #error Compiler version is not supported yet! + #endif + #elif (_MSC_VER == 1900) + #if (_MSC_FULL_VER == 190023026) + "MSVC 2015"; + #elif (_MSC_FULL_VER == 190023506) + "MSVC 2015.1"; + #elif (_MSC_FULL_VER == 190023918) + "MSVC 2015.2"; + #elif (_MSC_FULL_VER == 190024210) || (_MSC_FULL_VER == 190024215) + "MSVC 2015.3"; + #else + #error Compiler version is not supported yet! + #endif + #elif (_MSC_VER == 1800) + #if (_MSC_FULL_VER == 180021005) + "MSVC 2013"; + #elif (_MSC_FULL_VER == 180030501) + "MSVC 2013.2"; + #elif (_MSC_FULL_VER == 180030723) + "MSVC 2013.3"; + #elif (_MSC_FULL_VER == 180031101) + "MSVC 2013.4"; + #elif (_MSC_FULL_VER == 180040629) + "MSVC 2013.5"; + #else + #error Compiler version is not supported yet! + #endif + #elif (_MSC_VER == 1700) + #if (_MSC_FULL_VER == 170050727) + "MSVC 2012"; + #elif (_MSC_FULL_VER == 170051106) + "MSVC 2012.1"; + #elif (_MSC_FULL_VER == 170060315) + "MSVC 2012.2"; + #elif (_MSC_FULL_VER == 170060610) + "MSVC 2012.3"; + #elif (_MSC_FULL_VER == 170061030) + "MSVC 2012.4"; + #else + #error Compiler version is not supported yet! + #endif + #elif (_MSC_VER == 1600) + #if (_MSC_FULL_VER >= 160040219) + "MSVC 2010-SP1"; + #else + "MSVC 2010"; + #endif + #elif (_MSC_VER == 1500) + #if (_MSC_FULL_VER >= 150030729) + "MSVC 2008-SP1"; + #else + "MSVC 2008"; + #endif #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"; - #else - static const char *const COMPILER_VERS = "MSVC 2010"; - #endif - #elif (_MSC_VER == 1500) - #if (_MSC_FULL_VER >= 150030729) - static const char *const COMPILER_VERS = "MSVC 2008-SP1"; - #else - static const char *const COMPILER_VERS = "MSVC 2008"; + #error Compiler is not supported! #endif #else #error Compiler is not supported! #endif - #else - #error Compiler is not supported! - #endif - return COMPILER_VERS; } //Architecture detection static const char *const compiler_arch(void) { - #if defined(_M_X64) - static const char *const COMPILER_ARCH = "x64"; - #elif defined(_M_IX86) - static const char *const COMPILER_ARCH = "x86"; - #else - #error Architecture is not supported! - #endif - + static const char *const COMPILER_ARCH = + #if defined(_M_X64) + "x64"; + #elif defined(_M_IX86) + "x86"; + #else + #error Architecture is not supported! + #endif return COMPILER_ARCH; } -- 2.11.0