# | (__| |_| | _ <| |___\r
# \___|\___/|_| \_\_____|\r
#\r
-# Copyright (C) 1999 - 2013, 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
\r
!IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH = ../../openssl-0.9.8y\r
+OPENSSL_PATH = ../../openssl-0.9.8zc\r
!ENDIF\r
\r
!IFNDEF ZLIB_PATH\r
########################################################\r
## Nothing more to do below this line!\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
+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\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
RTLIBD = /MDd\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
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
LFLAGS = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)\r
!ENDIF\r
\r
-\r
-LINKLIBS = $(LINKLIBS) ws2_32.lib wldap32.lib advapi32.lib\r
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) ws2_32.lib wldap32.lib advapi32.lib\r
+LINKLIBS = $(LINKLIBS) $(WINLIBS)\r
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(WINLIBS)\r
\r
all : release\r
\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
$(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