Base code merged to SPIN 2.4

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

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 5e8b392..985c1bc 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2014, 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 and 10\r
+# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11 and 12\r
 #\r
 # Usage: see usage message below\r
 #        Should be invoked from winbuild directory\r
@@ -50,11 +50,11 @@ ZIP        = zip.exe
 !IF "$(VC)"=="6"\r
 CC_NODEBUG  = cl.exe /O2 /DNDEBUG\r
 CC_DEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ\r
-CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL\r
+CFLAGS     = /I. /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL\r
 !ELSE\r
 CC_NODEBUG  = cl.exe /O2 /DNDEBUG\r
 CC_DEBUG    = cl.exe /Od /D_DEBUG /RTC1 /Z7 /LDd /W3\r
-CFLAGS      = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL\r
+CFLAGS      = /I. /I ../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL\r
 !ENDIF\r
 \r
 LFLAGS     = /nologo /machine:$(MACHINE)\r
@@ -112,7 +112,7 @@ SSL_LIBS     = libeay32.lib ssleay32.lib
 USE_SSL      = true\r
 SSL          = dll\r
 !ELSEIF "$(WITH_SSL)"=="static"\r
-SSL_LIBS     = libeay32.lib ssleay32.lib gdi32.lib user32.lib\r
+SSL_LIBS     = libeay32.lib ssleay32.lib gdi32.lib user32.lib crypt32.lib\r
 USE_SSL      = true\r
 SSL          = static\r
 !ENDIF\r
@@ -121,6 +121,27 @@ SSL          = static
 SSL_CFLAGS   = /DUSE_SSLEAY /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
@@ -187,17 +208,6 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
 !ENDIF\r
 \r
 \r
-!IFNDEF USE_SPNEGO\r
-USE_SPNEGO  = true\r
-!ELSEIF "$(USE_SPNEGO)"=="yes"\r
-USE_SPNEGO  = true\r
-!ENDIF\r
-\r
-!IF "$(USE_SPNEGO)"=="true"\r
-SPNEGO_CFLAGS = $(SPNEGO_CFLAGS) /DHAVE_SPNEGO\r
-!ENDIF\r
-\r
-\r
 !IFNDEF USE_WINSSL\r
 !IF "$(USE_SSL)"=="true"\r
 USE_WINSSL  = false\r
@@ -308,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
@@ -330,10 +345,6 @@ CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)
 CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)\r
 !ENDIF\r
 \r
-!IF "$(USE_SPNEGO)"=="true"\r
-CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)\r
-!ENDIF\r
-\r
 !IF "$(GEN_PDB)"=="true"\r
 CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"\r
 LFLAGS = $(LFLAGS) $(LFLAGS_PDB)\r
@@ -374,8 +385,13 @@ clean:
 !include CURL_OBJS.inc\r
 !include LIBCURL_OBJS.inc\r
 \r
+!IF "$(AS_DLL)" == "true"\r
+LIB_OBJS = $(LIBCURL_OBJS) $(RESOURCE)\r
+!ELSE\r
 LIB_OBJS = $(LIBCURL_OBJS)\r
-EXE_OBJS = $(CURL_OBJS)\r
+!ENDIF\r
+\r
+EXE_OBJS = $(CURL_OBJS) $(CURL_DIROBJ)\curl.res\r
 \r
 all : $(TARGET) $(PROGRAM_NAME)\r
 \r
@@ -386,12 +402,12 @@ 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
        @echo Using IPv6: $(USE_IPV6)\r
        @echo Using SSPI: $(USE_SSPI)\r
-       @echo Using SPNEGO: $(USE_SPNEGO)\r
        @echo Using WinSSL: $(USE_WINSSL)\r
        @echo CFLAGS:     $(CFLAGS)\r
        @echo LFLAGS:     $(LFLAGS)\r
@@ -420,6 +436,7 @@ $(DIRDIST):
 \r
 $(LIB_DIROBJ):\r
        @if not exist "$(LIB_DIROBJ)" mkdir $(LIB_DIROBJ)\r
+       @if not exist "$(LIB_DIROBJ)\vtls" mkdir $(LIB_DIROBJ)\vtls\r
 \r
 $(CURL_DIROBJ):\r
        @if not exist "$(CURL_DIROBJ)" mkdir $(CURL_DIROBJ)\r
@@ -432,6 +449,9 @@ $(CURL_DIROBJ):
 {$(LIBCURL_SRC_DIR)\}.c{$(LIB_DIROBJ)\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
+{$(LIBCURL_SRC_DIR)\vtls\}.c{$(LIB_DIROBJ)\vtls\}.obj:\r
+       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+\r
 $(LIB_DIROBJ)\libcurl.res: $(LIBCURL_SRC_DIR)\libcurl.rc\r
        rc $(RC_FLAGS)\r
 \r
@@ -457,7 +477,8 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
 CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \\r
  $(CURL_DIROBJ)\nonblock.obj \\r
  $(CURL_DIROBJ)\rawstr.obj \\r
- $(CURL_DIROBJ)\strtoofft.obj\r
+ $(CURL_DIROBJ)\strtoofft.obj \\r
+ $(CURL_DIROBJ)\warnless.obj\r
  \r
 $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)\r
        $(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)\r
@@ -474,6 +495,8 @@ $(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/rawstr.c\r
 $(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c\r
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
+$(CURL_DIROBJ)\warnless.obj: ../lib/warnless.c\r
+       $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/warnless.c\r
 $(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc\r
        rc $(CURL_RC_FLAGS)\r
 \r