diff options
| author | Elliott Hughes <enh@google.com> | 2018-08-03 14:37:21 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-08-03 14:37:21 -0700 |
| commit | 72d948d9a2b7be19b761bd3c69ae851a2708f36c (patch) | |
| tree | b099486ec60f2b93bb10d5b4c4f08d1f5ea63c02 /winbuild/MakefileBuild.vc | |
| parent | fedb562bb5945f38ff423cca9d8ed6b80e74bf8e (diff) | |
| download | external_curl-72d948d9a2b7be19b761bd3c69ae851a2708f36c.tar.gz external_curl-72d948d9a2b7be19b761bd3c69ae851a2708f36c.tar.bz2 external_curl-72d948d9a2b7be19b761bd3c69ae851a2708f36c.zip | |
Update to curl 7.61.0 - July 11 2018.
Bug: N/A
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: I9ae854de01fd5854f3a9e9a1b8443755fe8a22b4
Diffstat (limited to 'winbuild/MakefileBuild.vc')
| -rw-r--r-- | winbuild/MakefileBuild.vc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index bf79db37..019a414a 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -352,6 +352,8 @@ GEN_PDB = true !IFDEF EMBED_MANIFEST
MANIFESTTOOL = $(MT) -manifest $(DIRDIST)\bin\$(PROGRAM_NAME).manifest -outputresource:$(DIRDIST)\bin\$(PROGRAM_NAME);1
+!ELSE
+CURL_RC_FLAGS = $(CURL_RC_FLAGS) /dCURL_EMBED_MANIFEST
!ENDIF
# Runtime library configuration
@@ -502,7 +504,7 @@ package: $(TARGET) @-$(ZIP) -9 -q -r ..\$(CONFIG_NAME_LIB).zip .>nul 2<&1
@cd $(MAKEDIR)
-$(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)
+$(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DIRDIST)
@echo Using SSL: $(USE_SSL)
@echo Using NGHTTP2: $(USE_NGHTTP2)
@echo Using c-ares: $(USE_CARES)
|