diff options
| author | Haibo Huang <hhb@google.com> | 2020-03-04 02:22:48 -0800 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2020-03-04 14:52:15 -0800 |
| commit | b51266f7c848ad5d4a3a8afba83d1003e819102e (patch) | |
| tree | 695ba43ada853928cf8200de325d3bfd5eca9061 /winbuild/MakefileBuild.vc | |
| parent | 20c1fa87d386442426f42af68de56cc80b3fe206 (diff) | |
| download | external_curl-b51266f7c848ad5d4a3a8afba83d1003e819102e.tar.gz external_curl-b51266f7c848ad5d4a3a8afba83d1003e819102e.tar.bz2 external_curl-b51266f7c848ad5d4a3a8afba83d1003e819102e.zip | |
Upgrade curl to curl-7_69_0
Test: None
Change-Id: I32f36294d53083ccb27764ebc4bc8fe628f38d94
Diffstat (limited to 'winbuild/MakefileBuild.vc')
| -rw-r--r-- | winbuild/MakefileBuild.vc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 8267250c..4e39be66 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -61,11 +61,11 @@ CC = cl.exe !IF "$(VC)"=="6"
CC_NODEBUG = $(CC) /O2 /DNDEBUG
CC_DEBUG = $(CC) /Od /Gm /Zi /D_DEBUG /GZ
-CFLAGS = /I. /I../lib /I../include /nologo /W4 /wd4127 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL
+CFLAGS = /I. /I../lib /I../include /nologo /W4 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL
!ELSE
CC_NODEBUG = $(CC) /O2 /DNDEBUG
CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd
-CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL
+CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL
!ENDIF
LFLAGS = /nologo /machine:$(MACHINE)
@@ -222,6 +222,9 @@ CARES = static !IFDEF USE_CARES
CARES_CFLAGS = /DUSE_ARES /I"$(CARES_INC_DIR)"
+!IF "$(CARES)"=="static"
+CARES_CFLAGS = $(CARES_CFLAGS) /DCARES_STATICLIB
+!ENDIF
!ENDIF
|