# | (__| |_| | _ <| |___\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
\r
# All files in the Makefile.vc* series are generated automatically from the\r
# one made for MSVC version 6. Alas, if you want to do changes to any of the\r
-# fiels and send back to the project, edit the version six, make your diff and\r
+# files and send back to the project, edit the version six, make your diff and\r
# mail curl-users.\r
\r
#############################################################\r
# Makefile.msvc.names provides libcurl file names\r
# ------------------------------------------------\r
\r
-!INCLUDE ..\Makefile.msvc.names\r
-\r
+!INCLUDE ..\winbuild\Makefile.msvc.names\r
\r
\r
!IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH = ../../openssl-0.9.8w\r
+OPENSSL_PATH = ../../openssl-0.9.8zc\r
!ENDIF\r
\r
!IFNDEF ZLIB_PATH\r
-ZLIB_PATH = ../../zlib-1.2.6\r
+ZLIB_PATH = ../../zlib-1.2.8\r
!ENDIF\r
\r
!IFNDEF MACHINE\r
\r
########################################################\r
## Nothing more to do below this line!\r
-ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
-ZLIB_LFLAGS = "/LIBPATH:$(ZLIB_PATH)"\r
-ZLIB_LIBS = zlib.lib\r
-ZLIB_IMP_LIBS = zdll.lib\r
+\r
+ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
+ZLIB_LFLAGS = "/LIBPATH:$(ZLIB_PATH)"\r
+ZLIB_LIBS = zlib.lib\r
+ZLIB_IMP_LIBS = zdll.lib\r
\r
SSL_CFLAGS = /DUSE_SSLEAY\r
SSL_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"\r
-SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib\r
+SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib\r
+WINLIBS = ws2_32.lib wldap32.lib advapi32.lib\r
+\r
+WINSSL_CFLAGS = /DUSE_SCHANNEL\r
+#WINSSL_LIBS = gdi32.lib user32.lib\r
+\r
+!IFDEF USE_IDN\r
+WINLIBS = $(WINLIBS) normaliz.lib\r
+!ENDIF\r
\r
# Runtime library configuration\r
RTLIB = /MD\r
!ENDIF\r
\r
RELEASE_OBJS= \\r
- hugehelpr.obj \\r
nonblockr.obj \\r
rawstrr.obj \\r
strtoofftr.obj \\r
+ warnless.obj \\r
tool_binmoder.obj \\r
tool_bnamer.obj \\r
tool_cb_dbgr.obj \\r
tool_helpr.obj \\r
tool_helpersr.obj \\r
tool_homedirr.obj \\r
+ tool_hugehelpr.obj \\r
tool_libinfor.obj \\r
tool_mainr.obj \\r
+ tool_metalinkr.obj \\r
tool_mfilesr.obj \\r
tool_msgsr.obj \\r
tool_operater.obj \\r
curlr.res\r
\r
DEBUG_OBJS= \\r
- hugehelpd.obj \\r
nonblockd.obj \\r
rawstrd.obj \\r
strtoofftd.obj \\r
+ warnlessd.obj \\r
tool_binmoded.obj \\r
tool_bnamed.obj \\r
tool_cb_dbgd.obj \\r
tool_helpd.obj \\r
tool_helpersd.obj \\r
tool_homedird.obj \\r
+ tool_hugehelpd.obj \\r
tool_libinfod.obj \\r
tool_maind.obj \\r
+ tool_metalinkd.obj \\r
tool_mfilesd.obj \\r
tool_msgsd.obj \\r
tool_operated.obj \\r
!ENDIF\r
\r
#################################################\r
+# release static library with winssl and zlib\r
+\r
+!IF "$(CFG)" == "release-winssl-zlib"\r
+CFLAGS = $(CFLAGS) $(WINSSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB\r
+LINKLIBS = $(LIBCURL_STA_LIB_REL) $(WINSSL_LIBS) $(ZLIB_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(WINSSL_LIBS) $(ZLIB_LIBS)\r
+LFLAGS = $(LFLAGS) $(WINSSL_LFLAGS) $(ZLIB_LFLAGS)\r
+!ENDIF\r
+\r
+#################################################\r
# release static library with dynamic ssl\r
\r
!IF "$(CFG)" == "release-ssl-dll"\r
LFLAGS = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)\r
!ENDIF\r
\r
-\r
-LINKLIBS = $(LINKLIBS) ws2_32.lib wldap32.lib\r
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) ws2_32.lib wldap32.lib\r
+LINKLIBS = $(LINKLIBS) $(WINLIBS)\r
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(WINLIBS)\r
\r
all : release\r
\r
$(MANIFESTTOOL)\r
\r
## Release\r
-hugehelpr.obj: hugehelp.c\r
- $(CCR) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c\r
nonblockr.obj: ../lib/nonblock.c\r
$(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
rawstrr.obj: ../lib/rawstr.c\r
$(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c\r
strtoofftr.obj: ../lib/strtoofft.c\r
$(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
+warnless.obj: ../lib/warnless.c\r
+ $(CCR) $(CFLAGS) /Fo"$@" ../lib/warnless.c\r
tool_binmoder.obj: tool_binmode.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c\r
tool_bnamer.obj: tool_bname.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_helpers.c\r
tool_homedirr.obj: tool_homedir.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_homedir.c\r
+tool_hugehelpr.obj: tool_hugehelp.c\r
+ $(CCR) $(CFLAGS) /Zm200 /Fo"$@" tool_hugehelp.c\r
tool_libinfor.obj: tool_libinfo.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_libinfo.c\r
tool_mainr.obj: tool_main.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_main.c\r
+tool_metalinkr.obj: tool_metalink.c\r
+ $(CCR) $(CFLAGS) /Fo"$@" tool_metalink.c\r
tool_mfilesr.obj: tool_mfiles.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_mfiles.c\r
tool_msgsr.obj: tool_msgs.c\r
$(RCR) $(RESFLAGS) /Fo"$@" curl.rc\r
\r
## Debug\r
-hugehelpd.obj: hugehelp.c\r
- $(CCD) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c\r
nonblockd.obj: ../lib/nonblock.c\r
$(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
rawstrd.obj: ../lib/rawstr.c\r
$(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c\r
strtoofftd.obj: ../lib/strtoofft.c\r
$(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
+warnlessd.obj: ../lib/warnless.c\r
+ $(CCD) $(CFLAGS) /Fo"$@" ../lib/warnless.c\r
tool_binmoded.obj: tool_binmode.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c\r
tool_bnamed.obj: tool_bname.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_helpers.c\r
tool_homedird.obj: tool_homedir.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_homedir.c\r
+tool_hugehelpd.obj: tool_hugehelp.c\r
+ $(CCD) $(CFLAGS) /Zm200 /Fo"$@" tool_hugehelp.c\r
tool_libinfod.obj: tool_libinfo.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_libinfo.c\r
tool_maind.obj: tool_main.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_main.c\r
+tool_metalinkd.obj: tool_metalink.c\r
+ $(CCD) $(CFLAGS) /Fo"$@" tool_metalink.c\r
tool_mfilesd.obj: tool_mfiles.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_mfiles.c\r
tool_msgsd.obj: tool_msgs.c\r