diff options
author | Guenter Knauf <lists@gknw.net> | 2011-01-11 17:51:14 +0100 |
---|---|---|
committer | Guenter Knauf <lists@gknw.net> | 2011-01-11 17:51:14 +0100 |
commit | 308db9d780e234d37c3aa48432a76b8eb99dc4d2 (patch) | |
tree | dbc0aec887466fd458fca828038a680de67fc8d1 | |
parent | 03ea06b8e3654c0e81f6304e62c16797910bb9e8 (diff) |
Some Borland C++ makefile tweaks.
-rw-r--r-- | lib/Makefile.b32 | 13 | ||||
-rw-r--r-- | src/Makefile.b32 | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index 509ae2707..1f5d3fac2 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -11,14 +11,19 @@ # Written by Jaepil Kim, pit@paradise.net.nz ############################################################ +# Check if BCCDIR is set. +!if !$d(BCCDIR) +!error BCCDIR isn't defined +!endif + # Edit the path below to point to the base of your Zlib sources. !ifndef ZLIB_PATH -ZLIB_PATH = ../../zlib-1.2.1 +ZLIB_PATH = ../../zlib-1.2.5 !endif # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.7d +OPENSSL_PATH = ../../openssl-0.9.8q !endif # Set libcurl static lib, dll and import lib @@ -29,8 +34,8 @@ LIBCURL_IMPLIB = libcurl_imp.lib # Setup environment CXX = bcc32 LD = bcc32 -CP = copy -RM = del +CP = copy 2>NUL +RM = del /q /f 2>NUL LIB = tlib IMPLIB = implib diff --git a/src/Makefile.b32 b/src/Makefile.b32 index 7408dd2d9..c418f1b47 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -11,14 +11,19 @@ # Written by Jaepil Kim, pit@paradise.net.nz ############################################################ +# Check if BCCDIR is set. +!if !$d(BCCDIR) +!error BCCDIR isn't defined +!endif + # Edit the path below to point to the base of your Zlib sources. !ifndef ZLIB_PATH -ZLIB_PATH = ../../zlib-1.2.1 +ZLIB_PATH = ../../zlib-1.2.5 !endif # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.7d +OPENSSL_PATH = ../../openssl-0.9.8q !endif # Set program's name @@ -27,8 +32,8 @@ PROGNAME = curl.exe # Setup environment CXX = bcc32 LD = bcc32 -CP = copy -RM = del +CP = copy 2>NUL +RM = del /q /f 2>NUL LIB = tlib CXXFLAGS = -q -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro -tWM |