projects / platform / upstream / curl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert "Update to 7.40.1"
[platform/upstream/curl.git] / lib / Makefile.vc6
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 205b433..2a80fc4 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -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
@@ -62,18 +62,18 @@
 # Makefile.msvc.names provides libcurl file names\r
 # ------------------------------------------------\r
 \r
-!INCLUDE ..\Makefile.msvc.names\r
+!INCLUDE ..\winbuild\Makefile.msvc.names\r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH   = ../../openssl-0.9.8x\r
+OPENSSL_PATH   = ../../openssl-0.9.8y\r
 !ENDIF\r
 \r
 !IFNDEF LIBSSH2_PATH\r
-LIBSSH2_PATH   = ../../libssh2-1.4.2\r
+LIBSSH2_PATH   = ../../libssh2-1.4.3\r
 !ENDIF\r
 \r
 !IFNDEF ZLIB_PATH\r
-ZLIB_PATH  = ../../zlib-1.2.7\r
+ZLIB_PATH  = ../../zlib-1.2.8\r
 !ENDIF\r
 \r
 !IFNDEF MACHINE\r
@@ -103,27 +103,27 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK"
 #############################################################\r
 ## Nothing more to do below this line!\r
 \r
-CCNODBG    = cl.exe /O2 /DNDEBUG\r
-CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ\r
-CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
-CFLAGSSSH2 = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"\r
-CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
-CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1\r
-CFLAGSLIB  = /DCURL_STATICLIB\r
-LNKDLL     = link.exe /DLL\r
-LNKLIB     = link.exe /lib\r
-LFLAGS     = /nologo /machine:$(MACHINE)\r
-SSLLIBS    = libeay32.lib ssleay32.lib\r
-ZLIBLIBSDLL= zdll.lib\r
-ZLIBLIBS   = zlib.lib\r
-WINLIBS    = ws2_32.lib wldap32.lib\r
-CFLAGS     = $(CFLAGS)\r
-\r
-CFGSET     = FALSE\r
+CCNODBG      = cl.exe /O2 /DNDEBUG\r
+CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /GZ\r
+CFLAGSSSL    = /DUSE_SSLEAY /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
+CFLAGSWINSSL = /DUSE_SCHANNEL\r
+CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"\r
+CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
+CFLAGS       = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1\r
+CFLAGSLIB    = /DCURL_STATICLIB\r
+LNKDLL       = link.exe /DLL\r
+LNKLIB       = link.exe /lib\r
+LFLAGS       = /nologo /machine:$(MACHINE)\r
+SSLLIBS      = libeay32.lib ssleay32.lib\r
+ZLIBLIBSDLL  = zdll.lib\r
+ZLIBLIBS     = zlib.lib\r
+WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib\r
+CFLAGS       = $(CFLAGS)\r
+\r
+CFGSET       = FALSE\r
 \r
 !IFDEF WINDOWS_SSPI\r
 CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include\r
-WINLIBS = $(WINLIBS) version.lib\r
 !ENDIF\r
 \r
 !IFDEF USE_IPV6\r
@@ -166,6 +166,18 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
+# release-winssl\r
+\r
+!IF "$(CFG)" == "release-winssl"\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
+DIROBJ   = $(CFG)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LNK      = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL) $(CFLAGSLIB)\r
+CFGSET   = TRUE\r
+!ENDIF\r
+\r
+######################\r
 # release-zlib\r
 \r
 !IF "$(CFG)" == "release-zlib"\r
@@ -191,70 +203,66 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
-# release-ssl-dll\r
+# release-winssl-zlib\r
 \r
-!IF "$(CFG)" == "release-ssl-dll"\r
+!IF "$(CFG)" == "release-winssl-zlib"\r
 TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
-LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LNK      = $(LNKLIB) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
 ######################\r
-# release-zlib-dll\r
+# release-ssl-ssh2-zlib\r
 \r
-!IF "$(CFG)" == "release-zlib-dll"\r
+!IF "$(CFG)" == "release-ssl-ssh2-zlib"\r
 TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
 ######################\r
-# release-ssl-dll-zlib-dll\r
+# release-ssl-dll\r
 \r
-!IF "$(CFG)" == "release-ssl-dll-zlib-dll"\r
+!IF "$(CFG)" == "release-ssl-dll"\r
 TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
-LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
 ######################\r
-# release-ssl-ssh2-zlib\r
+# release-zlib-dll\r
 \r
-!IF "$(CFG)" == "release-ssl-ssh2-zlib"\r
-TARGET   = $(LIB_NAME).lib\r
+!IF "$(CFG)" == "release-zlib-dll"\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
-LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
-RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib\r
 !ENDIF\r
 \r
 ######################\r
-# debug-ssl-ssh2-zlib\r
+# release-ssl-dll-zlib-dll\r
 \r
-!IF "$(CFG)" == "debug-ssl-ssh2-zlib"\r
-TARGET   = $(LIB_NAME_DEBUG).lib\r
+!IF "$(CFG)" == "release-ssl-dll-zlib-dll"\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
-LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
+LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
-RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib\r
 !ENDIF\r
 \r
 ######################\r
@@ -358,6 +366,20 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
+# debug-ssl-ssh2-zlib\r
+\r
+!IF "$(CFG)" == "debug-ssl-ssh2-zlib"\r
+TARGET   = $(LIBCURL_STA_LIB_DBG)\r
+DIROBJ   = $(CFG)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
+LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CFGSET   = TRUE\r
+!ENDIF\r
+\r
+######################\r
 # debug-ssl-dll\r
 \r
 !IF "$(CFG)" == "debug-ssl-dll"\r
@@ -464,11 +486,11 @@ RESOURCE = $(DIROBJ)\libcurl.res
 !MESSAGE   release-dll-ssl-dll          - release dynamic library with dynamic ssl\r
 !MESSAGE   release-dll-zlib-dll         - release dynamic library with dynamic zlib\r
 !MESSAGE   release-dll-ssl-dll-zlib-dll - release dynamic library with dynamic ssl and dynamic zlib\r
-!MESSAGE   debug-ssl-ssh2-zlib          - debug static library with ssl, ssh2 and zlib\r
 !MESSAGE   debug                        - debug static library\r
 !MESSAGE   debug-ssl                    - debug static library with ssl\r
 !MESSAGE   debug-zlib                   - debug static library with zlib\r
 !MESSAGE   debug-ssl-zlib               - debug static library with ssl and zlib\r
+!MESSAGE   debug-ssl-ssh2-zlib          - debug static library with ssl, ssh2 and zlib\r
 !MESSAGE   debug-ssl-dll                - debug static library with dynamic ssl\r
 !MESSAGE   debug-zlib-dll               - debug static library with dynamic zlib\r
 !MESSAGE   debug-ssl-dll-zlib-dll       - debug static library with dynamic ssl and dynamic zlib\r
@@ -497,26 +519,36 @@ clean:
 # A config was provided, so the library can be built.\r
 #\r
 X_OBJS= \\r
+       $(DIROBJ)\amigaos.obj \\r
        $(DIROBJ)\asyn-ares.obj \\r
        $(DIROBJ)\asyn-thread.obj \\r
+       $(DIROBJ)\axtls.obj \\r
        $(DIROBJ)\base64.obj \\r
+       $(DIROBJ)\bundles.obj \\r
+       $(DIROBJ)\conncache.obj \\r
        $(DIROBJ)\connect.obj \\r
        $(DIROBJ)\content_encoding.obj \\r
        $(DIROBJ)\cookie.obj \\r
        $(DIROBJ)\curl_addrinfo.obj \\r
+       $(DIROBJ)\curl_darwinssl.obj \\r
        $(DIROBJ)\curl_fnmatch.obj \\r
        $(DIROBJ)\curl_gethostname.obj \\r
+       $(DIROBJ)\curl_gssapi.obj \\r
        $(DIROBJ)\curl_memrchr.obj \\r
+       $(DIROBJ)\curl_multibyte.obj \\r
        $(DIROBJ)\curl_ntlm.obj \\r
        $(DIROBJ)\curl_ntlm_core.obj \\r
        $(DIROBJ)\curl_ntlm_msgs.obj \\r
        $(DIROBJ)\curl_ntlm_wb.obj \\r
-       $(DIROBJ)\curl_rand.obj \\r
        $(DIROBJ)\curl_rtmp.obj \\r
        $(DIROBJ)\curl_sasl.obj \\r
+       $(DIROBJ)\curl_sasl_sspi.obj \\r
+       $(DIROBJ)\curl_schannel.obj \\r
        $(DIROBJ)\curl_sspi.obj \\r
        $(DIROBJ)\curl_threads.obj \\r
+       $(DIROBJ)\cyassl.obj \\r
        $(DIROBJ)\dict.obj \\r
+       $(DIROBJ)\dotdot.obj \\r
        $(DIROBJ)\easy.obj \\r
        $(DIROBJ)\escape.obj \\r
        $(DIROBJ)\file.obj \\r
@@ -531,6 +563,7 @@ X_OBJS= \
        $(DIROBJ)\hash.obj \\r
        $(DIROBJ)\hmac.obj \\r
        $(DIROBJ)\hostasyn.obj \\r
+       $(DIROBJ)\hostcheck.obj \\r
        $(DIROBJ)\hostip.obj \\r
        $(DIROBJ)\hostip4.obj \\r
        $(DIROBJ)\hostip6.obj \\r
@@ -541,10 +574,12 @@ X_OBJS= \
        $(DIROBJ)\http_negotiate.obj \\r
        $(DIROBJ)\http_negotiate_sspi.obj \\r
        $(DIROBJ)\http_proxy.obj \\r
+       $(DIROBJ)\idn_win32.obj \\r
        $(DIROBJ)\if2ip.obj \\r
        $(DIROBJ)\imap.obj \\r
        $(DIROBJ)\inet_ntop.obj \\r
        $(DIROBJ)\inet_pton.obj \\r
+       $(DIROBJ)\krb5.obj \\r
        $(DIROBJ)\ldap.obj \\r
        $(DIROBJ)\llist.obj \\r
        $(DIROBJ)\md4.obj \\r
@@ -553,15 +588,21 @@ X_OBJS= \
        $(DIROBJ)\mprintf.obj \\r
        $(DIROBJ)\multi.obj \\r
        $(DIROBJ)\netrc.obj \\r
+       $(DIROBJ)\non-ascii.obj \\r
        $(DIROBJ)\nonblock.obj \\r
+       $(DIROBJ)\nss.obj \\r
        $(DIROBJ)\openldap.obj \\r
        $(DIROBJ)\parsedate.obj \\r
        $(DIROBJ)\pingpong.obj \\r
+       $(DIROBJ)\pipeline.obj \\r
        $(DIROBJ)\polarssl.obj \\r
+       $(DIROBJ)\polarssl_threadlock.obj \\r
        $(DIROBJ)\pop3.obj \\r
        $(DIROBJ)\progress.obj \\r
+       $(DIROBJ)\qssl.obj \\r
        $(DIROBJ)\rawstr.obj \\r
        $(DIROBJ)\rtsp.obj \\r
+       $(DIROBJ)\security.obj \\r
        $(DIROBJ)\select.obj \\r
        $(DIROBJ)\sendf.obj \\r
        $(DIROBJ)\share.obj \\r
@@ -573,8 +614,9 @@ X_OBJS= \
        $(DIROBJ)\speedcheck.obj \\r
        $(DIROBJ)\splay.obj \\r
        $(DIROBJ)\ssh.obj \\r
-       $(DIROBJ)\sslgen.obj \\r
-       $(DIROBJ)\ssluse.obj \\r
+       $(DIROBJ)\vtls.obj \\r
+       $(DIROBJ)\openssl.obj \\r
+       $(DIROBJ)\strdup.obj \\r
        $(DIROBJ)\strequal.obj \\r
        $(DIROBJ)\strerror.obj \\r
        $(DIROBJ)\strtok.obj \\r
@@ -612,6 +654,9 @@ $(DIROBJ):
 {.\}.c{$(DIROBJ)\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
+{.\vtls\}.c{$(DIROBJ)\}.obj:\r
+       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+\r
 debug-dll\libcurl.res \\r
 debug-dll-ssl-dll\libcurl.res \\r
 debug-dll-zlib-dll\libcurl.res \\r
Domain: Network & Connectivity / Data Network;