[svn] Migrated Borland compiler support to the free C++Builder compiler.

diff --git a/ChangeLog b/ChangeLog
index 56442ca2061d7bfd7a5d23712441e98fde13953b..a2ebf475856e19b5a95705415cb61422d6c5bf4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-19  Chin-yuan Kuo  <sr1111111@yahoo.com.tw>
+
+       * configure.bat.in: Do not check %BORPATH% as C++Builder compiler
+       does not use it.
+       * windows/Makefile.src.bor:
+       * windows/config.h.bor:
+       Migrated to free (as in beer) C++Builder compiler.
+
 2002-03-13  Ian Abbott  <abbotti@mev.co.uk>
 
        * configure.bat: Removed (renamed to configure.bat.ini).

diff --git a/configure.bat.in b/configure.bat.in
index 9864659aec5ea362608c841656cbe2a0b5dcdf85..9a4d325eaacdc86b40325a63468553cbaf727307 100644 (file)
--- a/configure.bat.in
+++ b/configure.bat.in
@@ -20,8 +20,7 @@ cls
 if .%1 == .--borland goto :borland
 if .%1 == .--msvc goto :msvc
 if .%1 == .--watcom goto :watcom
-if not .%BORPATH% == . goto :borland
-if not .%1 == . goto :usage
+goto :usage
 
 :msvc
 copy windows\config.h.ms src\config.h > nul
@@ -58,5 +57,5 @@ cd src
 goto :end
 
 :usage
-echo Usage: Configure [--borland | --msvc | --watcom]
+echo "Usage: configure [--borland | --msvc | --watcom]"
 :end

diff --git a/windows/Makefile.src.bor b/windows/Makefile.src.bor
index 3bdb4cc221bfad4300bb75bcab680f6bba0b4125..e330503f04836f1fcdae8204843f36827ba7647c 100644 (file)
--- a/windows/Makefile.src.bor
+++ b/windows/Makefile.src.bor
@@ -2,16 +2,16 @@
 ## Makefile for use with watcom win95/winnt executable.
 
 CC=bcc32
-LINK=tlink32
+LINK=ilink32
 
 LFLAGS=
-CFLAGS=-DWINDOWS -DHAVE_CONFIG_H -I. -H -H=wget.csm -w-
+CFLAGS=-DWINDOWS -DHAVE_CONFIG_H -I. -H -H=wget.csm -w- -O2
 
 ## variables
 OBJS=cmpt.obj connect.obj fnmatch.obj ftp.obj ftp-basic.obj  \
-      ftp-ls.obj ftp-opie.obj getopt.obj headers.obj host.obj html.obj \
+      ftp-ls.obj ftp-opie.obj getopt.obj headers.obj host.obj html-parse.obj html-url.obj \
       http.obj init.obj log.obj main.obj gnu-md5.obj netrc.obj rbuf.obj  \
-      alloca.obj \
+      safe-ctype.obj hash.obj progress.obj gen-md5.obj cookies.obj \
       recur.obj res.obj retr.obj url.obj utils.obj version.obj mswindows.obj
 
 LIBDIR=$(MAKEDIR)\..\lib
@@ -20,7 +20,9 @@ wget.exe: $(OBJS)
   $(LINK) @&&|
 $(LFLAGS) -Tpe -ap -c +
 $(LIBDIR)\c0x32.obj+
-alloca.obj+
+cookies.obj+
+hash.obj+
+safe-ctype.obj+
 version.obj+
 utils.obj+
 url.obj+
@@ -37,7 +39,8 @@ main.obj+
 log.obj+
 init.obj+
 http.obj+
-html.obj+
+html-parse.obj+
+html-url.obj+
 host.obj+
 headers.obj+
 getopt.obj+

diff --git a/windows/config.h.bor b/windows/config.h.bor
index 44491a9d0a8e7ffa2c964e36c92c7fe6079a5fcd..be6db5a5a2f04def9f3a3023c4f852b930c85d7c 100644 (file)
--- a/windows/config.h.bor
+++ b/windows/config.h.bor
@@ -19,6 +19,10 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#define HAVE_MEMMOVE
+#define ftruncate chsize
+#define inline __inline
+
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
 
@@ -33,7 +37,7 @@
  #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+#    include <malloc.h>
 #   endif
 #  endif
 # endif
@@ -177,7 +181,7 @@ char *alloca ();
 #define HAVE_BUILTIN_MD5 1
 
 /* Define if you have the isatty function.  */
-#undef HAVE_ISATTY
+#define HAVE_ISATTY
 
 
 #endif /* CONFIG_H */