generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile.b32: Fixed for vtls changes

Browse Source 
Follow up fix to commits a47c142a88, 11e8066ef9 and 92b9ae5c5d.

Bug: http://curl.haxx.se/mail/lib-2014-05/0025.html
Reported and assisted by: Jon Torrey
This commit is contained in:
Steve Holme 2014-05-09 21:09:51 +01:00
parent 22ee67a1ca
commit 0ab2c444b5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Makefile.b32
View File

@ -49,9 +49,9 @@ CC_FLAGS = -5 -O2 -tWM -w -w-aus -w-ccc -w-dup -w-prc -w-pro -w-rch -w-sig -w-sp
LIBFLAGS = /C /P32 LIBFLAGS = /C /P32
LDFLAGS = -q -lq -laa -tWD LDFLAGS = -q -lq -laa -tWD
SRCDIR = . SRCDIR = .;.\vtls
OBJDIR = .\BCC_objs OBJDIR = .\BCC_objs
INCDIRS = -I.;..\include INCDIRS = -I.;.\lib;..\include
LINKLIB = $(BCCDIR)\lib\cw32mt.lib $(BCCDIR)\lib\ws2_32.lib LINKLIB = $(BCCDIR)\lib\cw32mt.lib $(BCCDIR)\lib\ws2_32.lib
DEFINES = -DNDEBUG -DWIN32 -DBUILDING_LIBCURL DEFINES = -DNDEBUG -DWIN32 -DBUILDING_LIBCURL
@ -94,10 +94,11 @@ LINKLIB = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\l
# build source files with hyphens in their name as objects with underscores # build source files with hyphens in their name as objects with underscores
# using explicit compilation build rules instead of implicit ones. # using explicit compilation build rules instead of implicit ones.
NOHYPHEN = $(CSOURCES:-=_) NOHYPHEN1 = $(CSOURCES:-=_)
NOHYPHEN2 = $(NOHYPHEN1:vtls/=)
OBJECTS = $(NOHYPHEN:.c=.obj) OBJECTS = $(NOHYPHEN2:.c=.obj)
PREPROCESSED = $(NOHYPHEN:.c=.int) PREPROCESSED = $(NOHYPHEN2:.c=.int)
# Borland's command line compiler (BCC32) version 5.5.1 integrated # Borland's command line compiler (BCC32) version 5.5.1 integrated
# preprocessor has a bug which results in silently generating wrong # preprocessor has a bug which results in silently generating wrong