summaryrefslogtreecommitdiff
path: root/win32/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'win32/makefile.mk')
-rw-r--r--win32/makefile.mk150
1 files changed, 12 insertions, 138 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 945ca9edef..f23d8fa8b2 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -2,7 +2,6 @@
# Makefile to build perl on Windows using DMAKE.
# Supported compilers:
# Microsoft Visual C++ 6.0 or later
-# Borland C++ 5.02 or later
# MinGW with gcc-3.2 or later
# Windows SDK 64-bit compiler and tools
#
@@ -117,19 +116,10 @@ USE_LARGE_FILES *= define
#CCTYPE = MSVC100FREE
# Visual C++ 2010 (aka Visual C++ 10.x) (full version)
#CCTYPE = MSVC100
-# Borland 5.02 or later
-#CCTYPE *= BORLAND
# MinGW or mingw-w64 with gcc-3.2 or later
CCTYPE *= GCC
#
-# uncomment this if your Borland compiler is older than v5.4.
-#BCCOLD *= define
-#
-# uncomment this if you want to use Borland's VCL as your CRT
-#BCCVCL *= define
-
-#
# uncomment this if you are compiling under Windows 95/98 and command.com
# (not needed if you're running under 4DOS/NT 6.01 or later)
#IS_WIN95 *= define
@@ -191,9 +181,7 @@ CCTYPE *= GCC
# so you may have to set CCHOME explicitly (spaces in the path name should
# not be quoted)
#
-.IF "$(CCTYPE)" == "BORLAND"
-CCHOME *= C:\Borland\BCC55
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
CCHOME *= C:\MinGW
.ELSE
CCHOME *= $(MSVCDIR)
@@ -400,65 +388,7 @@ INST_HTML = $(INST_TOP)$(INST_VER)\html
.USESHELL :
-.IF "$(CCTYPE)" == "BORLAND"
-
-CC = bcc32
-.IF "$(BCCOLD)" != "define"
-LINK32 = ilink32
-.ELSE
-LINK32 = tlink32
-.ENDIF
-LIB32 = tlib /a /P128
-IMPLIB = implib -c
-RSC = brcc32
-
-#
-# Options
-#
-INCLUDES = -I$(COREDIR) -I.\include -I. -I.. -I"$(CCINCDIR)"
-#PCHFLAGS = -H -Hc -H=c:\temp\bcmoduls.pch
-DEFINES = -DWIN32
-LOCDEFS = -DPERLDLL -DPERL_CORE
-SUBSYS = console
-CXX_FLAG = -P
-
-LIBC = cw32mti.lib
-
-# same libs as MSVC, except Borland doesn't have oldnames.lib
-LIBFILES = \
- kernel32.lib user32.lib gdi32.lib winspool.lib \
- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
- netapi32.lib uuid.lib ws2_32.lib mpr.lib winmm.lib \
- version.lib odbc32.lib odbccp32.lib comctl32.lib \
- import32.lib $(LIBC)
-
-.IF "$(CFG)" == "Debug"
-OPTIMIZE = -v -D_RTLDLL -DDEBUGGING
-LINK_DBG = -v
-.ELSE
-OPTIMIZE = -O2 -D_RTLDLL
-LINK_DBG =
-.ENDIF
-
-EXTRACFLAGS =
-CFLAGS = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
- $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS = $(LINK_DBG) -x -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" \
- -L"$(CCLIBDIR)\PSDK"
-OBJOUT_FLAG = -o
-EXEOUT_FLAG = -e
-LIBOUT_FLAG =
-.IF "$(BCCOLD)" != "define"
-LINK_FLAGS += -Gn
-DEFINES += -D_MT -D__USELOCALES__ -D_WIN32_WINNT=0x0410
-.END
-.IF "$(BCCVCL)" == "define"
-LIBC = cp32mti.lib vcl.lib vcl50.lib vclx50.lib vcle50.lib
-LINK_FLAGS += -L"$(CCLIBDIR)\Release"
-.END
-
-
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
.IF "$(GCCCROSS)" == "define"
ARCHPREFIX = x86_64-w64-mingw32-
@@ -670,10 +600,7 @@ LKPOST = )
$(NOOP)
$(o).dll:
-.IF "$(CCTYPE)" == "BORLAND"
- $(LINK32) -Tpd -ap $(BLINK_FLAGS) c0d32$(o) $<,$@,,$(LIBFILES),$(*B).def
- $(IMPLIB) $(*B).lib $@
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
$(LINK32) -o $@ $(BLINK_FLAGS) $< $(LIBFILES)
$(IMPLIB) --input-def $(*B).def --output-lib $(*B).a $@
.ELSE
@@ -729,7 +656,6 @@ PERLDEP = perldll.def
PL2BAT = bin\pl2bat.pl
-GLOBBAT = bin\perlglob.bat
UTILS = \
..\utils\h2ph \
@@ -768,12 +694,7 @@ UTILS = \
bin\perlglob.pl \
bin\search.pl
-.IF "$(CCTYPE)" == "BORLAND"
-
-CFGSH_TMPL = config.bc
-CFGH_TMPL = config_H.bc
-
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
.IF "$(WIN64)" == "define"
.IF "$(GCCCROSS)" == "define"
@@ -1096,11 +1017,7 @@ CHECKDMAKE :
.ENDIF
$(GLOBEXE) : perlglob$(o)
-.IF "$(CCTYPE)" == "BORLAND"
- $(CC) -c -w -v -tWM -I"$(CCINCDIR)" perlglob.c
- $(LINK32) -Tpe -ap $(BLINK_FLAGS) c0x32$(o) perlglob$(o) \
- "$(CCLIBDIR)\32BIT\wildargs$(o)",$@,,import32.lib cw32mt.lib,
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
$(LINK32) $(BLINK_FLAGS) -mconsole -o $@ perlglob$(o) $(LIBFILES)
.ELSE
$(LINK32) $(BLINK_FLAGS) $(LIBFILES) -out:$@ -subsystem:$(SUBSYS) \
@@ -1133,8 +1050,6 @@ config.w32 : $(CFGSH_TMPL)
# this target to regenerate config_H.gc.
# unfortunately, some further manual editing is also then required to restore all
# the special _MSC_VER handling that is otherwise lost.
-# repeat for config.bc and config_H.bc (using BORLAND), except that there is no
-# _MSC_VER stuff in that case.
regen_config_h:
$(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \
$(CFGSH_TMPL) > ..\config.sh
@@ -1157,12 +1072,7 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
$(MINIPERL) : $(MINIDIR) $(MINI_OBJ) $(CRTIPMLIBS)
-.IF "$(CCTYPE)" == "BORLAND"
- if not exist $(CCLIBDIR)\PSDK\odbccp32.lib \
- cd $(CCLIBDIR)\PSDK && implib odbccp32.lib $(ODBCCP32_DLL)
- $(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(MINI_OBJ),$@,,$(LIBFILES),)
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
$(LINK32) -v -mconsole -o $@ $(BLINK_FLAGS) \
$(mktmp $(LKPRE) $(MINI_OBJ) $(LIBFILES) $(LKPOST))
.ELSE
@@ -1211,12 +1121,7 @@ perldll.def : $(MINIPERL) $(CONFIGPM) ..\embed.fnc ..\makedef.pl create_perllibs
$(BUILDOPT) CCTYPE=$(CCTYPE) TARG_DIR=..\ > perldll.def
$(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
-.IF "$(CCTYPE)" == "BORLAND"
- $(LINK32) -Tpd -ap $(BLINK_FLAGS) \
- @$(mktmp c0d32$(o) $(PERLDLL_OBJ),$@,, \
- $(shell @type Extensions_static) $(LIBFILES),perldll.def)
- $(IMPLIB) $*.lib $@
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
$(LINK32) -mdll -o $@ -Wl,--base-file -Wl,perl.base $(BLINK_FLAGS) \
$(mktmp $(LKPRE) $(PERLDLL_OBJ) \
$(shell @type Extensions_static) \
@@ -1240,11 +1145,7 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
$(XCOPY) $(PERLIMPLIB) $(COREDIR)
$(PERLSTATICLIB): Extensions_static
-.IF "$(CCTYPE)" == "BORLAND"
- $(LIB32) $(LIB_FLAGS) $@ \
- @$(mktmp $(shell @type Extensions_static) \
- $(PERLDLL_OBJ))
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
# XXX: It would be nice if MinGW's ar accepted a temporary file, but this
# doesn't seem to work:
# $(LIB32) $(LIB_FLAGS) $@ \
@@ -1282,10 +1183,7 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl
$(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions
$(MINIPERL) -I..\lib ..\x2p\find2perl.PL
$(MINIPERL) -I..\lib ..\x2p\s2p.PL
-.IF "$(CCTYPE)" == "BORLAND"
- $(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(X2P_OBJ),$@,,$(LIBFILES),)
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
$(LINK32) -v -o $@ $(BLINK_FLAGS) \
$(mktmp $(LKPRE) $(X2P_OBJ) $(LIBFILES) $(LKPOST))
.ELSE
@@ -1304,10 +1202,7 @@ $(BITCOUNT_H) : $(GENUUDMAP)
$(GENUUDMAP_OBJ) : ..\mg_raw.h
$(GENUUDMAP) : $(GENUUDMAP_OBJ)
-.IF "$(CCTYPE)" == "BORLAND"
- $(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(GENUUDMAP_OBJ),$@,,$(LIBFILES),)
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
$(LINK32) -v -o $@ $(BLINK_FLAGS) \
$(mktmp $(LKPRE) $(GENUUDMAP_OBJ) $(LIBFILES) $(LKPOST))
.ELSE
@@ -1329,11 +1224,7 @@ perlmainst$(o) : perlmainst.c
$(CC) $(CFLAGS_O) $(OBJOUT_FLAG)$@ -c perlmainst.c
$(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES)
-.IF "$(CCTYPE)" == "BORLAND"
- $(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(PERLEXE_OBJ),$@,, \
- $(PERLIMPLIB) $(LIBFILES),,$(PERLEXE_RES))
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
$(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \
$(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB) $(LIBFILES)
.ELSE
@@ -1345,12 +1236,7 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES)
$(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS
$(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES)
-.IF "$(CCTYPE)" == "BORLAND"
- $(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(PERLEXEST_OBJ),$@,, \
- $(shell @type Extensions_static) $(PERLSTATICLIB) $(LIBFILES),, \
- $(PERLEXE_RES))
-.ELIF "$(CCTYPE)" == "GCC"
+.IF "$(CCTYPE)" == "GCC"
$(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \
$(mktmp $(LKPRE) $(shell @type Extensions_static) \
$(PERLSTATICLIB) $(LIBFILES) $(PERLEXEST_OBJ) \
@@ -1594,11 +1480,7 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils
$(XCOPY) $(MINIPERL) ..\t\$(NULL)
if exist ..\t\perl.exe del /f ..\t\perl.exe
rename ..\t\miniperl.exe perl.exe
-.IF "$(CCTYPE)" == "BORLAND"
- $(XCOPY) $(GLOBBAT) ..\t\$(NULL)
-.ELSE
$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
-.ENDIF
attrib -r ..\t\*.*
cd ..\t && \
$(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
@@ -1606,11 +1488,7 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils
test-prep : all utils ..\pod\perltoc.pod
$(XCOPY) $(PERLEXE) ..\t\$(NULL)
$(XCOPY) $(PERLDLL) ..\t\$(NULL)
-.IF "$(CCTYPE)" == "BORLAND"
- $(XCOPY) $(GLOBBAT) ..\t\$(NULL)
-.ELSE
$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
-.ENDIF
.IF "$(CCTYPE)" == "GCC"
# If building with gcc versions 4.x.x or greater, then
@@ -1649,11 +1527,7 @@ test-notty : test-prep
_test : $(RIGHTMAKE)
$(XCOPY) $(PERLEXE) ..\t\$(NULL)
$(XCOPY) $(PERLDLL) ..\t\$(NULL)
-.IF "$(CCTYPE)" == "BORLAND"
- $(XCOPY) $(GLOBBAT) ..\t\$(NULL)
-.ELSE
$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
-.ENDIF
set PERL_STATIC_EXT=$(STATIC_EXT) && \
cd ..\t && $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES)
View Lorry Controller Status