Propagate changes to generated wx/msw/setup0.h back to setup_inc.h
Changes of d053a90486
only updated the generated
wx/msw/setup0.h file but not the file wx/msw/setup_inc.h from which it is
generated and so would have been lost after the next modification to the
latter.
Modify the latter one too to ensure that the changes stick.
See https://github.com/wxWidgets/wxWidgets/pull/238
This commit is contained in:
@@ -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
|
||||
|
@@ -72,7 +72,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
|
||||
|
@@ -655,7 +655,7 @@
|
||||
|
||||
#define wxUSE_ACTIVEX 0
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1700
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined(_USING_V110_SDK71_)
|
||||
#define wxUSE_WINRT 0
|
||||
#else
|
||||
#define wxUSE_WINRT 0
|
||||
|
Reference in New Issue
Block a user