moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-10 21:48:10 -05:00
Code Issues Releases Wiki Activity

winbuild: Use macros for the names of some build utilities

Browse Source 
- Add macros to the top of the makefile for rc and mt utilities so that
  it is easier to change their locations.

Bug: https://curl.haxx.se/mail/lib-2018-02/0075.html
Reported-by: Stefan Kanthak

Closes https://github.com/curl/curl/issues/2329
This commit is contained in:
Rod Widdowson 2018-02-23 15:17:09 -05:00 committed by Jay Satiro
parent 1be96a2952
commit 5fb70ea170
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winbuild/MakefileBuild.vc
View File

@ -45,6 +45,11 @@
CFGSET=FALSE CFGSET=FALSE
WINBUILD_DIR=`cd` WINBUILD_DIR=`cd`
# Utilities.
# If a path is required that contains characters such as space, quote the path.
MT = mt.exe
RC = rc.exe
ZIP = zip.exe ZIP = zip.exe
# Allow changing C compiler via environment variable CC (default cl.exe) # Allow changing C compiler via environment variable CC (default cl.exe)
@ -267,7 +272,7 @@ GEN_PDB = true
!IFDEF EMBED_MANIFEST !IFDEF EMBED_MANIFEST
MANIFESTTOOL = mt -manifest $(DIRDIST)\bin\$(PROGRAM_NAME).manifest -outputresource:$(DIRDIST)\bin\$(PROGRAM_NAME);1 MANIFESTTOOL = $(MT) -manifest $(DIRDIST)\bin\$(PROGRAM_NAME).manifest -outputresource:$(DIRDIST)\bin\$(PROGRAM_NAME);1
!ENDIF !ENDIF
# Runtime library configuration # Runtime library configuration
@ -496,7 +501,7 @@ $(CURL_DIROBJ):
$(CURL_CC) $(CFLAGS) /Fo"$@" $< $(CURL_CC) $(CFLAGS) /Fo"$@" $<
$(LIB_DIROBJ)\libcurl.res: $(LIBCURL_SRC_DIR)\libcurl.rc $(LIB_DIROBJ)\libcurl.res: $(LIBCURL_SRC_DIR)\libcurl.rc
rc $(RC_FLAGS) $(RC) $(RC_FLAGS)
# #
# curl.exe # curl.exe