mirror of
https://github.com/moparisthebest/curl
synced 2024-12-23 08:38:49 -05:00
winbuild: Add manifest to curl.exe for proper OS version detection
This is a small fix to commit ebd213270a
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
This commit is contained in:
parent
41db01a39f
commit
96a3ab7bc8
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user