summaryrefslogtreecommitdiff
path: root/winbuild
diff options
context:
space:
mode:
authorRod Widdowson <rdw@steadingsoftware.com>2018-02-23 15:17:09 -0500
committerJay Satiro <raysatiro@yahoo.com>2018-02-23 15:20:58 -0500
commit5fb70ea17001d328b07ed3f1971870446208054a (patch)
treeccff660166b1d6bd137c6fddf108d074c9d11e85 /winbuild
parent1be96a29522655944c33afc10041fc0b14f746b5 (diff)
downloadcurl-5fb70ea17001d328b07ed3f1971870446208054a.tar.gz
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
Diffstat (limited to 'winbuild')
-rw-r--r--winbuild/MakefileBuild.vc9
1 files changed, 7 insertions, 2 deletions
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