diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-09 19:21:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-09 19:21:37 +0100 |
| commit | c179db29d972cfe31187011756e637f4f5bc451c (patch) | |
| tree | 2b9649d6fd255a78a09cdb5246078de94828f484 | |
| parent | a607e6125edad4d2a59c9632371118cf3fca868a (diff) | |
| parent | a3387a9e22285abb179b3ce8c7f52052948c2600 (diff) | |
Merge pull request #12787 from vnen/uwp-vs2017
UWP: Update to build with Windows SDK 10.16229.0
| -rw-r--r-- | platform/uwp/detect.py | 2 | ||||
| -rw-r--r-- | thirdparty/openssl/uwp.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index af53f97446..434c597449 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -84,7 +84,7 @@ def configure(env): ## Architecture arch = "" - if os.getenv('Platform') == "ARM": + if str(os.getenv('Platform')).lower() == "arm": print("Compiled program architecture will be an ARM executable. (forcing bits=32).") diff --git a/thirdparty/openssl/uwp.cpp b/thirdparty/openssl/uwp.cpp index dcfd22b77f..e00c9d59db 100644 --- a/thirdparty/openssl/uwp.cpp +++ b/thirdparty/openssl/uwp.cpp @@ -103,12 +103,14 @@ extern "C" { return 0; } +#ifndef STD_ERROR_HANDLE int __cdecl GetStdHandle( _In_ DWORD nStdHandle ) { return 0; } +#endif BOOL DeregisterEventSource( _Inout_ HANDLE hEventLog ) |