From: Steve Holme Date: Wed, 8 Jan 2014 12:05:48 +0000 (+0000) Subject: winbuild: Follow up fix for a47c142a88c0, 11e8066ef956 and 92b9ae5c5d59 X-Git-Tag: curl-7_35_0~90 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f61e0a34eac58c645fd6f878a0108d45b2f7f6da;p=thirdparty%2Fcurl.git winbuild: Follow up fix for a47c142a88c0, 11e8066ef956 and 92b9ae5c5d59 --- diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 1f67010481..aca4ac9cad 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2013, Daniel Stenberg, , et al. +# Copyright (C) 1999 - 2014, 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 @@ -50,11 +50,11 @@ ZIP = zip.exe !IF "$(VC)"=="6" CC_NODEBUG = cl.exe /O2 /DNDEBUG CC_DEBUG = cl.exe /Od /Gm /Zi /D_DEBUG /GZ -CFLAGS = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL +CFLAGS = /I. /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL !ELSE CC_NODEBUG = cl.exe /O2 /DNDEBUG CC_DEBUG = cl.exe /Od /D_DEBUG /RTC1 /Z7 /LDd /W3 -CFLAGS = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL +CFLAGS = /I. /I ../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL !ENDIF LFLAGS = /nologo /machine:$(MACHINE) @@ -425,6 +425,7 @@ $(DIRDIST): $(LIB_DIROBJ): @if not exist "$(LIB_DIROBJ)" mkdir $(LIB_DIROBJ) + @if not exist "$(LIB_DIROBJ)\vtls" mkdir $(LIB_DIROBJ)\vtls $(CURL_DIROBJ): @if not exist "$(CURL_DIROBJ)" mkdir $(CURL_DIROBJ) @@ -437,6 +438,9 @@ $(CURL_DIROBJ): {$(LIBCURL_SRC_DIR)\}.c{$(LIB_DIROBJ)\}.obj: $(CC) $(CFLAGS) /Fo"$@" $< +{$(LIBCURL_SRC_DIR)\vtls\}.c{$(LIB_DIROBJ)\vtls\}.obj: + $(CC) $(CFLAGS) /Fo"$@" $< + $(LIB_DIROBJ)\libcurl.res: $(LIBCURL_SRC_DIR)\libcurl.rc rc $(RC_FLAGS)