From 9016958aa8989f7d998476a1742d5806f6a3692d Mon Sep 17 00:00:00 2001 From: Josue Andrade Gomes Date: Tue, 21 Jun 2011 20:05:06 +0200 Subject: [PATCH] windows build: use correct MS CRT --- lib/Makefile.vc6 | 2 +- src/Makefile.vc6 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 975cf85..a778801 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -101,7 +101,7 @@ CCNODBG = cl.exe /O2 /DNDEBUG CCDEBUG = cl.exe /Od /Gm /Zi /D_DEBUG /GZ CFLAGSSSL = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl" CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)" -CFLAGS = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL +CFLAGS = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 CFLAGSLIB = /DCURL_STATICLIB LNKDLL = link.exe /DLL LNKLIB = link.exe /lib diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 779f70b..a25680b 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2010, Daniel Stenberg, , et al. +# Copyright (C) 1999 - 2011, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -114,7 +114,7 @@ CCD = cl.exe $(RTLIBD) /Gm /ZI /Od /D_DEBUG /GZ LINKD = link.exe /incremental:yes /debug /libpath:"../lib" RCD = rc.exe /dDEBUGBUILD=1 -CFLAGS = /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c +CFLAGS = /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE) RESFLAGS = /i../include -- 2.7.4