diff options
| author | Pecio <szczepan.pecio@intel.com> | 2018-03-19 09:34:35 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-04-03 18:39:22 +0200 |
| commit | b2b4dfcca6cf2230107a711f7af1cd8ee3f74229 (patch) | |
| tree | 90c4e384e6b426a40a978ddd294cc6ca71223fb6 /Configurations/50-win-onecore.conf | |
| parent | fc1d73bb0c4f2977c999031debc7946c9b29fc8b (diff) | |
Enabled OneCore Conf for Console Apps (removed nonUniversal API)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5625)
Diffstat (limited to 'Configurations/50-win-onecore.conf')
| -rw-r--r-- | Configurations/50-win-onecore.conf | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Configurations/50-win-onecore.conf b/Configurations/50-win-onecore.conf index 1207621e67..c71d3646f2 100644 --- a/Configurations/50-win-onecore.conf +++ b/Configurations/50-win-onecore.conf @@ -4,7 +4,11 @@ # Mobile[?] Windows editions. It's a set up "umbrella" libraries that # export subset of Win32 API that are common to all Windows 10 devices. # -# TODO: drop onecore_downlevel.lib. +# OneCore Configuration temporarly dedicated for console applications +# due to disabled event logging, which is incompatible with one core. +# Error messages are provided via standard error only. +# TODO: extend error handling to use ETW based eventing +# (Or rework whole error messaging) my %targets = ( "VC-WIN32-ONECORE" => { @@ -13,12 +17,14 @@ my %targets = ( # hidden reference to kernel32.lib, but we don't actually want # it in "onecore" build. lflags => add("/NODEFAULTLIB:kernel32.lib"), - ex_libs => "onecore.lib onecore_downlevel.lib", + defines => add("OPENSSL_SYS_WIN_CORE"), + ex_libs => "onecore.lib", }, "VC-WIN64A-ONECORE" => { inherit_from => [ "VC-WIN64A" ], lflags => add("/NODEFAULTLIB:kernel32.lib"), - ex_libs => "onecore.lib onecore_downlevel.lib", + defines => add("OPENSSL_SYS_WIN_CORE"), + ex_libs => "onecore.lib", }, # Windows on ARM targets. ARM compilers are additional components in @@ -39,18 +45,20 @@ my %targets = ( "VC-WIN32-ARM" => { inherit_from => [ "VC-noCE-common" ], - defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE"), + defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE", + "OPENSSL_SYS_WIN_CORE"), bn_ops => "BN_LLONG RC4_CHAR EXPORT_VAR_AS_FN", lflags => add("/NODEFAULTLIB:kernel32.lib"), - ex_libs => "onecore.lib onecore_downlevel.lib", + ex_libs => "onecore.lib", multilib => "-arm", }, "VC-WIN64-ARM" => { inherit_from => [ "VC-noCE-common" ], - defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE"), + defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE", + "OPENSSL_SYS_WIN_CORE"), bn_ops => "SIXTY_FOUR_BIT RC4_CHAR EXPORT_VAR_AS_FN", lflags => add("/NODEFAULTLIB:kernel32.lib"), - ex_libs => "onecore.lib onecore_downlevel.lib", + ex_libs => "onecore.lib", multilib => "-arm64", }, ); |