From df101cab769a7026ac2a0032c11905ed6bcb60f8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 17 Mar 2016 22:04:48 +0100 Subject: [PATCH] Regenerate wx/msw/setup0.h after merging MinGW changes The merge db70be1a7c70f0ccb69b2bf89d1b0d00491c4cac accidentally reverted the changes of d053a904865fc14574bf09ca2c227055aa82ca32, restore them. --- include/wx/msw/setup0.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index abee9b51d4..6ccbf11792 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1560,7 +1560,7 @@ // SDK components manually, you need to change this setting. // // Recommended setting: 1 -#if defined(_MSC_VER) && _MSC_VER >= 1700 +#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined(_USING_V110_SDK71_) #define wxUSE_WINRT 1 #else #define wxUSE_WINRT 0