From 96a3ab7bc8fcf731322e6d141f5eb8e4ad856e1a Mon Sep 17 00:00:00 2001 From: Joel Depooter Date: Sun, 22 Sep 2019 13:03:18 -0700 Subject: winbuild: Add manifest to curl.exe for proper OS version detection This is a small fix to commit ebd213270a017a6830928ee2e1f4a9cabc799898 in pull request #1221. That commit added the CURL_EMBED_MANIFEST flag to CURL_RC_FLAGS. However, later in the file CURL_RC_FLAGS is overwritten. The fix is to append values to CURL_RC_FLAGS instead of overwriting Closes #4399 --- winbuild/MakefileBuild.vc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winbuild') diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 8d68b3184..5cc16501b 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -393,11 +393,11 @@ CFGSET = true !IF "$(DEBUG)"=="yes" RC_FLAGS = /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc CURL_CC = $(CC_DEBUG) $(RTLIB_DEBUG) -CURL_RC_FLAGS = /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc +CURL_RC_FLAGS = $(CURL_RC_FLAGS) /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc !ELSE RC_FLAGS = /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc CURL_CC = $(CC_NODEBUG) $(RTLIB) -CURL_RC_FLAGS = /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc +CURL_RC_FLAGS = $(CURL_RC_FLAGS) /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc !ENDIF !IF "$(AS_DLL)" == "true" -- cgit v1.2.3