Commit 0ab2c444 authored by Steve Holme's avatar Steve Holme
Browse files

Makefile.b32: Fixed for vtls changes 

Follow up fix to commits a47c142a, 11e8066e and 92b9ae5c.

Bug: http://curl.haxx.se/mail/lib-2014-05/0025.html
Reported and assisted by: Jon Torrey
parent 22ee67a1

lib/Makefile.b32

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

LDFLAGS  = -q -lq -laa -tWD



SRCDIR   = .

SRCDIR   = .;.\vtls

OBJDIR   = .\BCC_objs

INCDIRS  = -I.;..\include

INCDIRS  = -I.;.\lib;..\include

LINKLIB  = $(BCCDIR)\lib\cw32mt.lib $(BCCDIR)\lib\ws2_32.lib

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

# using explicit compilation build rules instead of implicit ones.



NOHYPHEN = $(CSOURCES:-=_)

NOHYPHEN1 = $(CSOURCES:-=_)

NOHYPHEN2 = $(NOHYPHEN1:vtls/=)



OBJECTS = $(NOHYPHEN:.c=.obj)

PREPROCESSED = $(NOHYPHEN:.c=.int)

OBJECTS = $(NOHYPHEN2:.c=.obj)

PREPROCESSED = $(NOHYPHEN2:.c=.int)



# Borland's command line compiler (BCC32) version 5.5.1 integrated

# preprocessor has a bug which results in silently generating wrong