]> granicus.if.org Git - curl/commitdiff
winbuild: Use macros for the names of some build utilities
authorRod Widdowson <rdw@steadingsoftware.com>
Fri, 23 Feb 2018 20:17:09 +0000 (15:17 -0500)
committerJay Satiro <raysatiro@yahoo.com>
Fri, 23 Feb 2018 20:20:58 +0000 (15:20 -0500)
- 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

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