From 3d431c099f339f44757942e96b6a1bf5afa78bd3 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Mon, 12 Nov 2012 21:42:56 +0100 Subject: [PATCH] Added compiler detection for VS2012. --- src/Config.h | 2 +- src/Global.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Config.h b/src/Config.h index 623d6341..28a9c55f 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 7 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 2 -#define VER_LAMEXP_BUILD 1181 +#define VER_LAMEXP_BUILD 1182 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Global.cpp b/src/Global.cpp index 3b6aa333..13b08f47 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -153,7 +153,13 @@ static bool g_lamexp_console_attached = false; #error Compiler is not supported! #endif #elif defined(_MSC_VER) - #if (_MSC_VER == 1600) + #if (_MSC_VER == 1700) + #if (_MSC_FULL_VER < 170050727) + static const char *g_lamexp_version_compiler = "MSVC 2012-Beta"; + #else + static const char *g_lamexp_version_compiler = "MSVC 2012"; + #endif + #elif (_MSC_VER == 1600) #if (_MSC_FULL_VER >= 160040219) static const char *g_lamexp_version_compiler = "MSVC 2010-SP1"; #else