Merge branch 'webrequest-build-fixes' of https://github.com/MaartenBent/wxWidgets

wxWebRequest-related build fixes for MinGW.

See https://github.com/wxWidgets/wxWidgets/pull/2283
This commit is contained in:
Vadim Zeitlin
2021-03-23 14:16:07 +01:00
13 changed files with 149 additions and 57 deletions

View File

@@ -1650,11 +1650,7 @@
//
// Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1,
// otherwise wxWebRequest won't be available at all.
#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)
#define wxUSE_WEBREQUEST_WINHTTP 1
#else
#define wxUSE_WEBREQUEST_WINHTTP 0
#endif
#define wxUSE_WEBREQUEST_WINHTTP 1
// ----------------------------------------------------------------------------
// Windows-only settings