Commit 9016958a authored by Josue Andrade Gomes's avatar Josue Andrade Gomes Committed by Daniel Stenberg
Browse files

windows build: use correct MS CRT

parent 1614dc07

lib/Makefile.vc6

+1 −1
Original line number Diff line number Diff line
@@ -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

src/Makefile.vc6

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1999 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1999 - 2011, Daniel Stenberg, <daniel@haxx.se>, 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