summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorNick Ing-Simmons <nik@tiuk.ti.com>2002-01-28 20:12:31 +0000
committerNick Ing-Simmons <nik@tiuk.ti.com>2002-01-28 20:12:31 +0000
commitc572eed062f4ffbffd46dc88f12c81ca9a28e084 (patch)
treea4b0d94a2dcd1f4e0fae350532b0d842e1586fb1 /win32
parent3c2828ef18626c87f126b2753f1bc7708770876f (diff)
downloadperl-c572eed062f4ffbffd46dc88f12c81ca9a28e084.tar.gz
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
Diffstat (limited to 'win32')
-rw-r--r--win32/config.bc2
-rw-r--r--win32/makefile.mk10
2 files changed, 8 insertions, 4 deletions
diff --git a/win32/config.bc b/win32/config.bc
index b647858359..4c9bcc7336 100644
--- 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 b7f75663af..a4cf314e6e 100644
--- 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