summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorJan Dubois <jand@activestate.com>2010-07-21 18:15:54 -0700
committerJan Dubois <jand@activestate.com>2010-07-21 18:15:54 -0700
commitb6c85593a554a961f8d6994f7e4c5551a0a5eb2c (patch)
treeb80534ff87a9f43f716315187f77beb61a789061 /win32
parent6d8f7c99d6105c3e91ba7907750682703fe0414b (diff)
downloadperl-b6c85593a554a961f8d6994f7e4c5551a0a5eb2c.tar.gz
Don't pretend to support really old VC++ compilers
The oldest supported Visual C++ compiler is VC6 (released in 1998), and we already jump through some hoops for it by inlining newer API definitions in win32/win32.c. It is desirable to keep supporting VC6 because it is the last MSVC release that links against MSVCRT.dll and not against a compiler specific runtime library.
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile15
-rw-r--r--win32/makefile.mk16
2 files changed, 7 insertions, 24 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 40aa60f066..33d920c4a5 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1,7 +1,7 @@
#
-# Makefile to build perl on Windows NT using Microsoft NMAKE.
+# Makefile to build perl on Windows using Microsoft NMAKE.
# Supported compilers:
-# Visual C++ 2.0 or later
+# Microsoft Visual C++ 6.0 or later
# Windows SDK 64-bit compiler and tools
#
# This is set up to build a perl.exe that runs off a shared library
@@ -95,10 +95,6 @@ USE_LARGE_FILES = define
#
# uncomment exactly one of the following
#
-# Visual C++ 2.x
-#CCTYPE = MSVC20
-# Visual C++ > 2.x and < 6.x
-#CCTYPE = MSVC
# Visual C++ 6.x (aka Visual C++ 98)
CCTYPE = MSVC60
# Visual C++ Toolkit 2003 (aka Visual C++ 7.x) (free command-line tools)
@@ -188,7 +184,6 @@ CRYPT_SRC = fcrypt.c
# so you may have to set CCHOME explicitly (spaces in the path name should
# not be quoted)
#
-#CCHOME = f:\msvc20
CCHOME = $(MSVCDIR)
CCINCDIR = $(CCHOME)\include
CCLIBDIR = $(CCHOME)\lib
@@ -432,11 +427,7 @@ CXX_FLAG = -TP -EHsc
LIBC = msvcrt.lib
!IF "$(CFG)" == "Debug"
-! IF "$(CCTYPE)" == "MSVC20"
-OPTIMIZE = -Od -MD -Z7 -DDEBUGGING
-! ELSE
OPTIMIZE = -Od -MD -Zi -DDEBUGGING
-! ENDIF
LINK_DBG = -debug
!ELSE
OPTIMIZE = -MD -Zi -DNDEBUG
@@ -474,7 +465,7 @@ DEFINES = $(DEFINES) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
# Use the MSVCRT read() fix only when using VC++ 6.x or earlier. Later
# versions use MSVCR70.dll, MSVCR71.dll, etc, which do not require the
# fix.
-!IF "$(CCTYPE)" == "MSVC20" || "$(CCTYPE)" == "MSVC" || "$(CCTYPE)" == "MSVC60"
+!IF "$(CCTYPE)" == "MSVC60"
BUILDOPT = $(BUILDOPT) -DPERL_MSVCRT_READFIX
!ENDIF
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 7488bde137..27837729b0 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1,10 +1,10 @@
#
-# Makefile to build perl on Windows NT using DMAKE.
+# Makefile to build perl on Windows using DMAKE.
# Supported compilers:
-# Visual C++ 2.0 or later
+# Microsoft Visual C++ 6.0 or later
# Borland C++ 5.02 or later
# MinGW with gcc-2.95.2 or later
-# MS Platform SDK 64-bit compiler and tools **experimental**
+# Windows SDK 64-bit compiler and tools **experimental**
#
# This is set up to build a perl.exe that runs off a shared library
# (perl513.dll). Also makes individual DLLs for the XS extensions.
@@ -97,10 +97,6 @@ USE_LARGE_FILES *= define
#
# uncomment exactly one of the following
#
-# Visual C++ 2.x
-#CCTYPE *= MSVC20
-# Visual C++ > 2.x and < 6.x
-#CCTYPE *= MSVC
# Visual C++ 6.x (aka Visual C++ 98)
#CCTYPE *= MSVC60
# Visual C++ Toolkit 2003 (aka Visual C++ 7.x) (free command-line tools)
@@ -580,11 +576,7 @@ CXX_FLAG = -TP -EHsc
LIBC = msvcrt.lib
.IF "$(CFG)" == "Debug"
-.IF "$(CCTYPE)" == "MSVC20"
-OPTIMIZE = -Od -MD -Z7 -DDEBUGGING
-.ELSE
OPTIMIZE = -O1 -MD -Zi -DDEBUGGING
-.ENDIF
LINK_DBG = -debug
.ELSE
OPTIMIZE = -MD -Zi -DNDEBUG
@@ -622,7 +614,7 @@ DEFINES += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
# Use the MSVCRT read() fix only when using VC++ 6.x or earlier. Later
# versions use MSVCR70.dll, MSVCR71.dll, etc, which do not require the
# fix.
-.IF "$(CCTYPE)" == "MSVC20" || "$(CCTYPE)" == "MSVC" || "$(CCTYPE)" == "MSVC60"
+.IF "$(CCTYPE)" == "MSVC60"
BUILDOPT += -DPERL_MSVCRT_READFIX
.ENDIF