From ebd213270a017a6830928ee2e1f4a9cabc799898 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 30 May 2018 12:08:26 +0000 Subject: curl.rc: embed manifest for correct Windows version detection * enable it in `src/Makefile.m32` * enable it in `winbuild/MakefileBuild.vc` if a custom manifest is _not_ enabled via the existing `EMBED_MANIFEST` option * enable it for all Windows CMake builds (also disable the built-in minimal manifest, added by CMake by default.) For other build systems, add the `-DCURL_EMBED_MANIFEST` option to the list of RC (Resource Compiler) flags to enable the manifest included in `src/curl.rc`. This may require to disable whatever automatic or other means in which way another manifest is added to `curl.exe`. Notice that Borland C doesn't support this method due to a long-pending resource compiler bug. Watcom C may also not handle it correctly when the `-zm` `wrc` option is used (this option may be unnecessary though) and regardless of options in certain earlier revisions of the 2.0 beta version. Closes https://github.com/curl/curl/pull/1221 Fixes https://github.com/curl/curl/issues/2591 --- winbuild/MakefileBuild.vc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'winbuild/MakefileBuild.vc') diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 51ebfb867..019a414a0 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2017, Daniel Stenberg, , et al. +# Copyright (C) 1999 - 2018, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -352,6 +352,8 @@ GEN_PDB = true !IFDEF EMBED_MANIFEST MANIFESTTOOL = $(MT) -manifest $(DIRDIST)\bin\$(PROGRAM_NAME).manifest -outputresource:$(DIRDIST)\bin\$(PROGRAM_NAME);1 +!ELSE +CURL_RC_FLAGS = $(CURL_RC_FLAGS) /dCURL_EMBED_MANIFEST !ENDIF # Runtime library configuration -- cgit v1.2.1