Set makefile.mk CCHOME etc. for default locations of MinGW and free

Borland compilers. (Borland builds one or two oddities.)

p4raw-id: //depot/perlio@14477

diff --git a/win32/config.bc b/win32/config.bc
index b647858..4c9bcc7 100644 (file)
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -66,7 +66,7 @@ cppflags='-DWIN32'
 cpplast=''
 cppminus=''
 cpprun='cpp32 -oCON'
-cppstdin='cpp32 -oCON'
+cppstdin='cppstdin'
 cppsymbols=''
 cryptlib=''
 csh='undef'

diff --git a/win32/makefile.mk b/win32/makefile.mk
index b7f7566..a4cf314 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -96,7 +96,7 @@ CCTYPE                *= MSVC60
 
 #
 # uncomment this if your Borland compiler is older than v5.4.
-BCCOLD = define
+#BCCOLD = define
 #
 # uncomment this if you want to use Borland's VCL as your CRT
 #BCCVCL = define
@@ -163,9 +163,13 @@ CFG                *= Debug
 # so you may have to set CCHOME explicitly (spaces in the path name should
 # not be quoted)
 #
-#CCHOME                *= F:\borland\bc5
+.IF "$(CCTYPE)" == "BORLAND"
+CCHOME         *= C:\borland\bcc55
+.ELIF "$(CCTYPE)" == "GCC"
+CCHOME         *= C:\MinGW
+.ELSE
 CCHOME         *= $(MSVCDIR)
-#CCHOME                *= c:\gcc-2.95.2
+.ENDIF
 CCINCDIR       *= $(CCHOME)\include
 CCLIBDIR       *= $(CCHOME)\lib