aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-05-09 21:09:51 +0100
committerSteve Holme <steve_holme@hotmail.com>2014-05-09 21:09:51 +0100
commit0ab2c444b55b7c6de6d6ea519bd74a14aa1be208 (patch)
tree364080498f8150da1f0574995afaa18cc7a0f698
parent22ee67a1cafafa9942dd28339542d91c0cdb134d (diff)
Makefile.b32: Fixed for vtls changes
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
-rw-r--r--lib/Makefile.b3211
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index 7dbb37fcb..9ad586af1 100644
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -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