diff options
| author | David Cole <david.cole@kitware.com> | 2011-11-04 17:07:38 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-11-04 17:07:38 (GMT) |
| commit | a2e6d2482e4eb007c8012f2aee3b2381cc95a001 (patch) | |
| tree | addac5da1dbf526316333bcad800818a73cb5595 | |
| parent | c71f7ab7db843234cab7e6b75ab2636a0d7e8d67 (diff) | |
| download | CMake-a2e6d2482e4eb007c8012f2aee3b2381cc95a001.zip CMake-a2e6d2482e4eb007c8012f2aee3b2381cc95a001.tar.gz CMake-a2e6d2482e4eb007c8012f2aee3b2381cc95a001.tar.bz2 | |
Tests: Fix MFC test to work with VS 10 and later (#11213)
The mfc app in the test was generated by the VS 7.1 wizard,
and due to changes in VS since then, the values used for WINVER
and _WIN32_WINNT caused compile errors when built with VS 10
or later. Change them to values appropriate for targeting
Windows XP or later when building with VS 10 or later.
See http://msdn.microsoft.com/en-us/library/6sehtctf.aspx
for more info.
| -rw-r--r-- | Tests/MFC/mfc1/stdafx.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h index fb9dfb3..35a678d 100644 --- a/Tests/MFC/mfc1/stdafx.h +++ b/Tests/MFC/mfc1/stdafx.h @@ -8,23 +8,38 @@ #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #endif +// See http://msdn.microsoft.com/en-us/library/6sehtctf.aspx for more info +// on WINVER and _WIN32_WINNT + // Modify the following defines if you have to target a platform prior to the ones specified below. // Refer to MSDN for the latest info on corresponding values for different platforms. #ifndef WINVER // Allow use of features specific to Windows 95 and Windows NT 4 or later. +#if _MSC_VER < 1600 #define WINVER 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later. +#else +#define WINVER 0x0501 // Target Windows XP and later with VS 10 and later +#endif #endif #ifndef _WIN32_WINNT // Allow use of features specific to Windows NT 4 or later. +#if _MSC_VER < 1600 #define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later. +#else +#define _WIN32_WINNT 0x0501 // Target Windows XP and later with VS 10 and later +#endif #endif #ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later. +#if _MSC_VER < 1600 #define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. #endif +#endif #ifndef _WIN32_IE // Allow use of features specific to IE 4.0 or later. +#if _MSC_VER < 1600 #define _WIN32_IE 0x0400 // Change this to the appropriate value to target IE 5.0 or later. #endif +#endif #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit |