diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-03-10 08:23:04 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-03-10 08:23:04 +0100 |
| commit | 1468a5f0d32b46609e282bb7b7bfec13592c855f (patch) | |
| tree | ad6cf6a5d4450bb3a745e4c7415420a0b0fd9d1d | |
| parent | 5aa1accc9207aea812f543285958843666f7c71e (diff) | |
| download | ATCD-1468a5f0d32b46609e282bb7b7bfec13592c855f.tar.gz | |
Added separate configuration file for Visual Studio 2017, no special settings yet
* ACE/ace/config-win32-msvc-15.h:
Added.
* ACE/ace/config-win32-msvc.h:
| -rw-r--r-- | ACE/ace/config-win32-msvc-15.h | 30 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc.h | 4 |
2 files changed, 33 insertions, 1 deletions
diff --git a/ACE/ace/config-win32-msvc-15.h b/ACE/ace/config-win32-msvc-15.h new file mode 100644 index 00000000000..1067638a7bf --- /dev/null +++ b/ACE/ace/config-win32-msvc-15.h @@ -0,0 +1,30 @@ +/* -*- C++ -*- */ +//============================================================================= +/** + * @file config-win32-msvc-15.h + * + * @brief Microsoft Visual C++ 15.0 configuration file. + * + * This file is the ACE configuration file for Microsoft Visual C++ version 2017. + * + * @note Do not include this file directly, include config-win32.h instead. + */ +//============================================================================= + +#ifndef ACE_CONFIG_WIN32_MSVC_15_H +#define ACE_CONFIG_WIN32_MSVC_15_H +#include /**/ "ace/pre.h" + +#ifndef ACE_CONFIG_WIN32_H +#error Use config-win32.h in config.h instead of this header +#endif /* ACE_CONFIG_WIN32_H */ + +#ifndef ACE_WIN32_VC15 +# define ACE_WIN32_VC15 +#endif + +// Until we have specific msvc15 settings, include the msvc12 file +#include "ace/config-win32-msvc-14.h" + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_WIN32_MSVC_15_H */ diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 65973367530..993da2e5298 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -38,7 +38,9 @@ #endif /* _WIN32_WCE */ //FUZZ: disable check_for_msc_ver -#if (_MSC_VER >= 1900) +#if (_MSC_VER >= 1910) +# include "ace/config-win32-msvc-15.h" +#elif (_MSC_VER >= 1900) # include "ace/config-win32-msvc-14.h" #elif (_MSC_VER >= 1800) # include "ace/config-win32-msvc-12.h" |