From 5fb70ea17001d328b07ed3f1971870446208054a Mon Sep 17 00:00:00 2001 From: Rod Widdowson Date: Fri, 23 Feb 2018 15:17:09 -0500 Subject: winbuild: Use macros for the names of some build utilities - 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 --- winbuild/MakefileBuild.vc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'winbuild') diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 442888ce7..54160beb1 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -45,6 +45,11 @@ CFGSET=FALSE 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 # Allow changing C compiler via environment variable CC (default cl.exe) @@ -267,7 +272,7 @@ GEN_PDB = true !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 # Runtime library configuration @@ -496,7 +501,7 @@ $(CURL_DIROBJ): $(CURL_CC) $(CFLAGS) /Fo"$@" $< $(LIB_DIROBJ)\libcurl.res: $(LIBCURL_SRC_DIR)\libcurl.rc - rc $(RC_FLAGS) + $(RC) $(RC_FLAGS) # # curl.exe -- cgit v1.2.1