Change 14478 by jhi@alpha on 2002/01/28 21:19:40
Integrate perlio;
Set makefile.mk CCHOME etc. for default locations of MinGW and free
Borland compilers. (Borland builds one or two oddities.)
Affected files ...
.... //depot/perl/win32/config.bc#120 integrate
.... //depot/perl/win32/makefile.mk#218 integrate
Differences ...
==== //depot/perl/win32/config.bc#120 (text) ====
Index: perl/win32/config.bc
--- perl/win32/config.bc.~1~ Mon Jan 28 14:30:06 2002
+++ perl/win32/config.bc Mon Jan 28 14:30:06 2002
@@ -66,7 +66,7 @@
cpplast=''
cppminus=''
cpprun='cpp32 -oCON'
-cppstdin='cpp32 -oCON'
+cppstdin='cppstdin'
cppsymbols=''
cryptlib=''
csh='undef'
==== //depot/perl/win32/makefile.mk#218 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk.~1~ Mon Jan 28 14:30:06 2002
+++ perl/win32/makefile.mk Mon Jan 28 14:30:06 2002
@@ -96,7 +96,7 @@
#
# 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 @@
# 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
End of Patch.
