diff options
| author | Bernard Normier <bernard@zeroc.com> | 2013-02-12 18:39:29 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2013-02-12 18:39:29 -0500 |
| commit | f9761305196739b36a43a65997d2b6910517c80a (patch) | |
| tree | e083b0fe5c99801a1fc3078174ebbd666ed3eb0b /cpp | |
| parent | Removed DB 5.1 (diff) | |
| download | ice-f9761305196739b36a43a65997d2b6910517c80a.tar.bz2 ice-f9761305196739b36a43a65997d2b6910517c80a.tar.xz ice-f9761305196739b36a43a65997d2b6910517c80a.zip | |
Fixed ICE-5227 and ICE-5229: support for vc110_xp with Visual Studio 2012
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/config/Make.rules.msvc | 2 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 0e53499a5d9..04e765baa7a 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -27,7 +27,7 @@ PRELIBPATH = /LIBPATH: GENERATE_PDB = yes !endif -CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -w34100 -w34189 -EHsc +CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -EHsc ARFLAGS = $(ARFLAGS) -nologo -WX !if "$(WINRT)" == "yes" diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 0bedb0d53a8..1316240ac15 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -66,8 +66,11 @@ # define ICE_NOEXCEPT_FALSE /**/ #endif +// +// Visual Studio 2012 or later, without Windows XP/2003 support +// +#if defined(_MSC_VER) && (_MSC_VER >= 1700) && !defined(_USING_V110_SDK71_) -#if defined(_MSC_VER) && (_MSC_VER >= 1700) // Visual Studio 2012 or later // // Check if building for WinRT // @@ -76,11 +79,13 @@ # define ICE_OS_WINRT # define ICE_STATIC_LIBS # endif + // // Windows provides native condition variables on Vista and later, -// and Visual Studio 2012 no longer supports Windows XP or Windows Server 2003. +// and Visual Studio 2012 with the default Platform Toolset (vc100) no +// longer supports Windows XP or Windows Server 2003. // -// You can also "switch-on" this macro to use native condition variables with +// You can "switch-on" this macro to use native condition variables with // other C++ compilers on Windows. // # define ICE_HAS_WIN32_CONDVAR |