Imported Upstream version 7.44.0

[platform/upstream/curl.git] / winbuild / MakefileBuild.vc

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index b9e150c..28d40ba 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.\r
 #\r
 # This software is licensed as described in the file COPYING, which\r
 # you should have received as part of this distribution. The terms\r
@@ -22,7 +22,7 @@
 \r
 ###########################################################################\r
 #\r
-# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11 and 12\r
+# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11, 12 and 14\r
 #\r
 # Usage: see usage message below\r
 #        Should be invoked from winbuild directory\r
@@ -118,9 +118,30 @@ SSL          = static
 !ENDIF\r
 \r
 !IFDEF USE_SSL\r
-SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"\r
+SSL_CFLAGS   = /DUSE_OPENSSL /I"$(DEVEL_INCLUDE)/openssl"\r
 !ENDIF\r
 \r
+!IF "$(WITH_CARES)"=="dll"\r
+!IF "$(DEBUG)"=="yes"\r
+CARES_LIBS     = caresd.lib\r
+!ELSE\r
+CARES_LIBS     = cares.lib\r
+!ENDIF\r
+USE_CARES      = true\r
+CARES          = dll\r
+!ELSEIF "$(WITH_CARES)"=="static"\r
+!IF "$(DEBUG)"=="yes"\r
+CARES_LIBS     = libcaresd.lib\r
+!ELSE\r
+CARES_LIBS     = libcares.lib\r
+!ENDIF\r
+USE_CARES      = true\r
+CARES          = static\r
+!ENDIF\r
+\r
+!IFDEF USE_CARES\r
+CARES_CFLAGS   = /DUSE_ARES /I"$(DEVEL_INCLUDE)/cares"\r
+!ENDIF\r
 \r
 !IF "$(WITH_ZLIB)"=="dll"\r
 ZLIB_LIBS   = zlib.lib\r
@@ -297,6 +318,11 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS)
 LFLAGS = $(LFLAGS) $(SSL_LFLAGS) $(SSL_LIBS)\r
 !ENDIF\r
 \r
+!IF "$(USE_CARES)"=="true"\r
+CFLAGS = $(CFLAGS) $(CARES_CFLAGS)\r
+LFLAGS = $(LFLAGS) $(CARES_LFLAGS) $(CARES_LIBS)\r
+!ENDIF\r
+\r
 !IF "$(USE_ZLIB)"=="true"\r
 CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS)\r
 LFLAGS = $(LFLAGS) $(ZLIB_LFLAGS) $(ZLIB_LIBS)\r
@@ -376,6 +402,7 @@ package: $(TARGET)
 \r
 $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)\r
        @echo Using SSL: $(USE_SSL)\r
+       @echo Using c-ares: $(USE_CARES)\r
        @echo Using SSH2: $(USE_SSH2)\r
        @echo Using ZLIB: $(USE_ZLIB)\r
        @echo Using IDN:  $(USE_IDN)\r