From 72c5855f5c9e6b5747dc9571d64e217eff26561d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 10 Jul 2013 21:29:48 +0000 Subject: [PATCH] Recognize VC12 (a.k.a. MSVS 2013) and define __VISUALC12__ for it. Closes #15320. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/doxygen/mainpages/const_cpp.h | 2 +- include/msvc/wx/setup.h | 2 ++ include/wx/platform.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 2581eda5b3..2131fecd19 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -157,7 +157,7 @@ compiler used. @c 1020 for @c 4.2 (the first supported version), @c 1100 for @c 5.0, @c 1200 for @c 6.0 and so on. For convenience, the symbols __VISUALCn__ are also defined for each major compiler version from - 5 to 11, i.e. you can use tests such @ifdef_ __VISUALC7__ to test + 5 to 12, i.e. you can use tests such @ifdef_ __VISUALC7__ to test for compiler version being precisely 7.} @itemdef{__XLC__, AIX compiler} @itemdef{__WATCOMC__, Watcom C++. The value of this macro corresponds to diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h index f60059a208..0e3fdc72c8 100644 --- a/include/msvc/wx/setup.h +++ b/include/msvc/wx/setup.h @@ -62,6 +62,8 @@ #define wxCOMPILER_PREFIX vc100 #elif _MSC_VER == 1700 #define wxCOMPILER_PREFIX vc110 + #elif _MSC_VER == 1800 + #define wxCOMPILER_PREFIX vc120 #else #error "Unknown MSVC compiler version, please report to wx-dev." #endif diff --git a/include/wx/platform.h b/include/wx/platform.h index 9eaffa8a8d..e322e88fce 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -456,6 +456,8 @@ # define __VISUALC10__ # elif __VISUALC__ < 1800 # define __VISUALC11__ +# elif __VISUALC__ < 1900 +# define __VISUALC12__ # else # pragma message("Please update wx/platform.h to recognize this VC++ version") # endif -- 2.47.2