diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2001-03-29 15:30:03 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2001-03-29 15:30:03 +0000 |
| commit | 333a3a69dbd6af700a859aea53845f0d2115f52f (patch) | |
| tree | d5344021e092a05c9388c7b46a8624da334ac00b | |
| parent | 4e942ec0b77ec097fa004a64bdfc8572bc4c77ae (diff) | |
| parent | 80420121679c010642ed63d3dff1ac54d8e9d3f6 (diff) | |
| download | perl-333a3a69dbd6af700a859aea53845f0d2115f52f.tar.gz | |
Integrate win32/makefile.mk with mainline.
p4raw-id: //depot/perlio@9446
| -rw-r--r-- | win32/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 99a1cee801..3f6f9c2a19 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -107,7 +107,7 @@ CCTYPE *= MSVC60 # # uncomment this if your Borland compiler is older than v5.4. -BCCVER = 5.2 +BCCOLD = define # # uncomment this if you want to use Borland's VCL as your CRT #BCCVCL = define @@ -343,7 +343,7 @@ INST_HTML = $(INST_TOP)$(INST_VER)\html .IF "$(CCTYPE)" == "BORLAND" CC = bcc32 -.IF $(BCCVER) != 5.2 +.IF "$(BCCOLD)" != "define" LINK32 = ilink32 .ELSE LINK32 = tlink32 @@ -379,8 +379,8 @@ LINK_FLAGS = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" OBJOUT_FLAG = -o EXEOUT_FLAG = -e LIBOUT_FLAG = -.IF $(BCCVER) != 5.2 -LINK_FLAGS += -Gn +.IF "$(BCCOLD)" != "define" +LINK_FLAGS += -Gn .END .IF "$(BCCVCL)" == "define" LIBC = cp32mti.lib vcl.lib vcl50.lib vclx50.lib vcle50.lib |