diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-14 15:51:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 15:51:44 +0000 |
commit | 9aa1a64cabedcc41f8be6608e0ee872b56c454a3 (patch) | |
tree | 2c3eab943845aec3b36d6ea0e33ce0f5cc412033 /winbuild/MakefileBuild.vc | |
parent | 0c66739b05f29c81b6a0a6814929e1e6a51c6995 (diff) | |
parent | d82935bad8787715114b546d997bc3e494fb63cc (diff) | |
download | external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.tar.gz external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.tar.bz2 external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.zip |
Merge "Upgrade curl to curl-7_71_1" am: 23abcba889 am: d82935bad8
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1360986
Change-Id: If39a57f7925d048081295b1d981399e38ac55e22
Diffstat (limited to 'winbuild/MakefileBuild.vc')
-rw-r--r-- | winbuild/MakefileBuild.vc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 733f1cfa..db01eab7 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -618,7 +618,8 @@ CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \ $(CURL_DIROBJ)\nonblock.obj \
$(CURL_DIROBJ)\strtoofft.obj \
$(CURL_DIROBJ)\warnless.obj \
- $(CURL_DIROBJ)\curl_ctype.obj
+ $(CURL_DIROBJ)\curl_ctype.obj \
+ $(CURL_DIROBJ)\curl_multibyte.obj
$(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
@@ -637,6 +638,8 @@ $(CURL_DIROBJ)\warnless.obj: ../lib/warnless.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/warnless.c
$(CURL_DIROBJ)\curl_ctype.obj: ../lib/curl_ctype.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_ctype.c
+$(CURL_DIROBJ)\curl_multibyte.obj: ../lib/curl_multibyte.c
+ $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_multibyte.c
$(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc
rc $(CURL_RC_FLAGS)
|