add MSVC support to win32/GNUmakefile

-copy things from makefile.mk to GNUmakefile
-rework CFG_VARS to escape "s. Previously on gmake GCC builds, all "s
 inside the CFG_VARS vars were dropped from Config_heavy.pl due to
 command line parsing (dmake uses --cfgsh-option-file and a temp file,
 nmake escapes). Due to gmake's very poor temp file handling, keep it as
 a cmd line and dont convert it to a temp file. What vars to escape was
 modeled on the nmake makefile.

2 files changed, 411 insertions, 30 deletions

diff --git a/README.win32 b/README.win32
index 019ee7b58e..46efd62d58 100644
--- a/README.win32
+++ b/README.win32
@@ -97,14 +97,14 @@ See L<Usage Hints for Perl on Windows> below for general hints about this.
 
 You need a "make" program to build the sources.  If you are using
 Visual C++ or the Windows SDK tools, you can use nmake supplied with Visual C++
-or Windows SDK. You may also use, for Visual C++ or Windows SDK, dmake instead
-of nmake.  dmake is open source software, but is not included with Visual C++ or
-Windows SDK.  Builds using gcc need dmake or gmake.  nmake is not supported for
-gcc builds.  gmake only supports gcc builds, not any other compiler.
-Parallel building is only supported with dmake and gmake, not nmake.  When using
-dmake it is recommended to use dmake 4.13 or newer for parallel building.
-Older dmakes, in parallel mode, have very high CPU usage and pound the
-disk/filing system with duplicate I/O calls in an aggressive polling loop.
+or Windows SDK. You may also use, for Visual C++ or Windows SDK, dmake or gmake
+instead of nmake.  dmake is open source software, but is not included with
+Visual C++ or Windows SDK.  Builds using gcc need dmake or gmake.  nmake is not
+supported for gcc builds.  Parallel building is only supported with dmake and
+gmake, not nmake.  When using dmake it is recommended to use dmake 4.13 or newer
+for parallel building.  Older dmakes, in parallel mode, have very high CPU usage
+and pound the disk/filing system with duplicate I/O calls in an aggressive
+polling loop.
 
 A port of dmake for Windows is available from:
 
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 1a5f48bc91..06322c8ca0 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -1,5 +1,9 @@
 #
-# Makefile to build perl on Windows using GNU make + gcc + MinGW.
+# Makefile to build perl on Windows using GMAKE.
+# Supported compilers:
+#	Microsoft Visual C++ 6.0 or later
+#	MinGW with gcc-3.4.5 or later
+#	Windows SDK 64-bit compiler and tools
 #
 # This is set up to build a perl.exe that runs off a shared library
 # (perl523.dll).  Also makes individual DLLs for the XS extensions.
@@ -58,6 +62,12 @@ INST_DRV := c:
 INST_TOP := $(INST_DRV)\perl
 
 #
+# Uncomment if you want to build a 32-bit Perl using a 32-bit compiler
+# on a 64-bit version of Windows.
+#
+#WIN64		:= undef
+
+#
 # Comment this out if you DON'T want your perl installation to be versioned.
 # This means that the new installation will overwrite any files from the
 # old installation at the same INST_TOP location.  Leaving it enabled is
@@ -133,7 +143,8 @@ USE_LARGE_FILES	:= define
 #USE_64_BIT_INT	:= define
 
 #
-# Uncomment this if you want to support the use of long doubles.
+# Uncomment this if you want to support the use of long doubles in GCC builds.
+# This option is not supported for MSVC builds.
 #
 #USE_LONG_DOUBLE :=define
 
@@ -145,6 +156,45 @@ USE_LARGE_FILES	:= define
 #USE_NO_REGISTRY := define
 
 #
+# uncomment exactly one of the following
+#
+# Visual C++ 6.0 (aka Visual C++ 98)
+#CCTYPE		:= MSVC60
+# Visual C++ .NET 2002/2003 (aka Visual C++ 7.0/7.1) (full version)
+#CCTYPE		:= MSVC70
+# Visual C++ Toolkit 2003 (aka Visual C++ 7.1) (free command-line tools)
+#CCTYPE		:= MSVC70FREE
+# Windows Server 2003 SP1 Platform SDK (April 2005)
+#CCTYPE		:= SDK2003SP1
+# Visual C++ 2005 (aka Visual C++ 8.0) (full version)
+#CCTYPE		:= MSVC80
+# Visual C++ 2005 Express Edition (aka Visual C++ 8.0) (free version)
+#CCTYPE		:= MSVC80FREE
+# Visual C++ 2008 (aka Visual C++ 9.0) (full version)
+#CCTYPE		:= MSVC90
+# Visual C++ 2008 Express Edition (aka Visual C++ 9.0) (free version)
+#CCTYPE		:= MSVC90FREE
+# Visual C++ 2010 (aka Visual C++ 10.0) (full version)
+#CCTYPE		:= MSVC100
+# Visual C++ 2010 Express Edition (aka Visual C++ 10.0) (free version)
+#CCTYPE		:= MSVC100FREE
+# Visual C++ 2012 (aka Visual C++ 11.0) (full version)
+#CCTYPE		:= MSVC110
+# Visual C++ 2012 Express Edition (aka Visual C++ 11.0) (free version)
+#CCTYPE		:= MSVC110FREE
+# Visual C++ 2013 (aka Visual C++ 12.0) (full version)
+#CCTYPE		:= MSVC120
+# Visual C++ 2013 Express Edition (aka Visual C++ 12.0) (free version)
+#CCTYPE		:= MSVC120FREE
+# MinGW or mingw-w64 with gcc-3.4.5 or later
+CCTYPE		:= GCC
+
+#
+# If you are using Intel C++ Compiler uncomment this
+#
+#__ICC		:= define
+
+#
 # uncomment next line if you want debug version of perl (big/slow)
 # If not enabled, we automatically try to use maximum optimization
 # with all compilers that are known to have a working optimizer.
@@ -201,7 +251,11 @@ USE_LARGE_FILES	:= define
 # so you may have to set CCHOME explicitly (spaces in the path name should
 # not be quoted)
 #
+ifeq ($(CCTYPE),GCC)
 CCHOME		:= C:\MinGW
+else
+CCHOME		:= $(MSVCDIR)
+endif
 
 #
 # Following sets $Config{incpath} and $Config{libpth}
@@ -309,10 +363,59 @@ ifeq ($(USE_NO_REGISTRY),define)
 BUILDOPT	+= -DWIN32_NO_REGISTRY
 endif
 
+PROCESSOR_ARCHITECTURE  ?= x86
+
+ifeq ($(WIN64),undef)
+PROCESSOR_ARCHITECTURE	= x86
+endif
+
+ifeq ($(WIN64),)
+# When we are running from a 32bit cmd.exe on AMD64 then
+# PROCESSOR_ARCHITECTURE is set to x86 and PROCESSOR_ARCHITEW6432
+# is set to AMD64
+ifneq ($(PROCESSOR_ARCHITEW6432),)
+PROCESSOR_ARCHITECTURE	= $(PROCESSOR_ARCHITEW6432)
+WIN64			= define
+else ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
+WIN64			= define
+else ifeq ($(PROCESSOR_ARCHITECTURE),IA64)
+WIN64			= define
+else
+WIN64			= undef
+endif
+endif
+
 ifeq ($(WIN64),define)
 USE_64_BIT_INT	= define
 endif
 
+# Treat 64-bit MSVC60 (doesn't really exist) as SDK2003SP1 because
+# both link against MSVCRT.dll (which is part of Windows itself) and
+# not against a compiler specific versioned runtime.
+ifeq ("$(WIN64) $(CCTYPE)","define MSVC60")
+CCTYPE		= SDK2003SP1
+endif
+
+# Disable the 64-bit-int option for (32-bit) MSVC60 builds since that compiler
+# does not support it.
+ifeq ($(CCTYPE),MSVC60)
+USE_64_BIT_INT	= undef
+endif
+
+# Disable the long double option for MSVC builds since that compiler
+# does not support it.
+ifneq ($(CCTYPE),GCC)
+USE_LONG_DOUBLE	= undef
+endif
+
+ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
+ifeq ($(ARCHITECTURE),AMD64)
+ARCHITECTURE	= x64
+endif
+ifeq ($(ARCHITECTURE),IA64)
+ARCHITECTURE	= ia64
+endif
+
 ifeq ($(USE_MULTI),define)
 ARCHNAME	= MSWin32-$(ARCHITECTURE)-multi
 else
@@ -365,6 +468,8 @@ INST_HTML	= $(INST_TOP)$(INST_VER)\html
 
 MINIBUILDOPT    :=
 
+ifeq ($(CCTYPE),GCC)
+
 CC		= $(ARCHPREFIX)gcc
 LINK32		= $(ARCHPREFIX)g++
 LIB32		= $(ARCHPREFIX)ar rc
@@ -400,7 +505,6 @@ ifeq ($(WIN64),define)
 DEFINES		+= -DWIN64 -DCONSERVATIVE
 endif
 LOCDEFS		= -DPERLDLL -DPERL_CORE
-SUBSYS		= console
 CXX_FLAG	= -xc++
 LIBC		=
 LIBFILES	= $(LIBC) -lmoldname -lkernel32 -luser32 -lgdi32 -lwinspool \
@@ -425,12 +529,216 @@ PDBOUT		=
 
 BUILDOPT	+= -fno-strict-aliasing -mms-bitfields
 MINIBUILDOPT	+= -fno-strict-aliasing
+
+TESTPREPGCC	= test-prep-gcc
+
+else
+
+o = .obj
+
+# All but the free version of VC++ 7.1 can load DLLs on demand.  Makes the test
+# suite run in about 10% less time.
+ifneq ($(CCTYPE),MSVC70FREE)
+# If no registry, advapi32 is only used for Perl_pp_getlogin/getlogin/GetUserNameA
+# which is rare to execute
+ifneq ($(USE_NO_REGISTRY),undef)
+DELAYLOAD	= -DELAYLOAD:ws2_32.dll -DELAYLOAD:advapi32.dll delayimp.lib
+MINIDELAYLOAD	=
+else
+DELAYLOAD	= -DELAYLOAD:ws2_32.dll delayimp.lib
+#miniperl never does any registry lookups
+MINIDELAYLOAD	= -DELAYLOAD:advapi32.dll
+endif
+endif
+
+# Visual C++ 2005 and 2008 (VC++ 8.0 and 9.0) create manifest files for EXEs and
+# DLLs. These either need copying everywhere with the binaries, or else need
+# embedding in them otherwise MSVCR80.dll or MSVCR90.dll won't be found. For
+# simplicity, embed them if they exist (and delete them afterwards so that they
+# don't get installed too).
+EMBED_EXE_MANI	= if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1 && \
+		  if exist $@.manifest del $@.manifest
+EMBED_DLL_MANI	= if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 && \
+		  if exist $@.manifest del $@.manifest
+
+# Most relevant compiler-specific options fall into two groups:
+# either pre-MSVC80 or MSVC80 onwards, so define a macro for this.
+ifeq ($(CCTYPE),MSVC60)
+PREMSVC80	= define
+else ifeq ($(CCTYPE),MSVC70)
+PREMSVC80	= define
+else ifeq ($(CCTYPE),MSVC70FREE)
+PREMSVC80	= define
+else
+PREMSVC80	= undef
+endif
+
+ifneq ($(__ICC),define)
+CC		= cl
+LINK32		= link
+else
+CC		= icl
+LINK32		= xilink
+endif
+LIB32		= $(LINK32) -lib
+RSC		= rc
+
+#
+# Options
+#
+
+INCLUDES	= -I.\include -I. -I..
+#PCHFLAGS	= -Fpc:\temp\vcmoduls.pch -YX
+DEFINES		= -DWIN32 -D_CONSOLE -DNO_STRICT
+LOCDEFS		= -DPERLDLL -DPERL_CORE
+CXX_FLAG	= -TP -EHsc
+
+LIBC		= msvcrt.lib
+
+ifeq ($(CFG),Debug)
+OPTIMIZE	= -Od -MD -Zi -DDEBUGGING
+LINK_DBG	= -debug
+else ifeq ($(CFG),DebugSymbols)
+OPTIMIZE	= -Od -MD -Zi
+LINK_DBG	= -debug
+else ifeq ($(CFG),DebugFull)
+LIBC		= msvcrtd.lib
+OPTIMIZE	= -Od -MDd -Zi -D_DEBUG -DDEBUGGING
+LINK_DBG	= -debug
+else
+# -O1 yields smaller code, which turns out to be faster than -O2 on x86 and x64
+OPTIMIZE	= -O1 -MD -Zi -DNDEBUG
+# we enable debug symbols in release builds also
+LINK_DBG	= -debug -opt:ref,icf
+# you may want to enable this if you want COFF symbols in the executables
+# in addition to the PDB symbols.  The default Dr. Watson that ships with
+# Windows can use the the former but not latter.  The free WinDbg can be
+# installed to get better stack traces from just the PDB symbols, so we
+# avoid the bloat of COFF symbols by default.
+#LINK_DBG	= $(LINK_DBG) -debugtype:both
+ifneq ($(CCTYPE),MSVC60)
+# enable Whole Program Optimizations (WPO) and Link Time Code Generation (LTCG)
+OPTIMIZE	+= -GL
+LINK_DBG	+= -ltcg
+LIB_FLAGS	= -ltcg
+endif
+endif
+
+ifeq ($(WIN64),define)
+DEFINES		+= -DWIN64 -DCONSERVATIVE
+OPTIMIZE	+= -fp:precise
+endif
+
+# For now, silence warnings from VC++ 8.0 onwards about "unsafe" CRT functions
+# and POSIX CRT function names being deprecated.
+ifeq ($(PREMSVC80),undef)
+DEFINES		+= -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+endif
+
+# In VS 2005 (VC++ 8.0) Microsoft changes time_t from 32-bit to
+# 64-bit, even in 32-bit mode.  It also provides the _USE_32BIT_TIME_T
+# preprocessor option to revert back to the old functionality for
+# backward compatibility.  We define this symbol here for older 32-bit
+# compilers only (which aren't using it at all) for the sole purpose
+# of getting it into $Config{ccflags}.  That way if someone builds
+# Perl itself with e.g. VC6 but later installs an XS module using VC8
+# the time_t types will still be compatible.
+ifeq ($(WIN64),undef)
+ifeq ((PREMSVC80),define)
+BUILDOPT	+= -D_USE_32BIT_TIME_T
+endif
+endif
+
+LIBBASEFILES	= oldnames.lib 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
+
+# Avoid __intel_new_proc_init link error for libircmt.
+# libmmd is /MD equivelent, other variants exist.
+# libmmd is Intel C's math addon funcs to MS CRT, contains long doubles, C99,
+# and optimized C89 funcs
+ifeq ($(__ICC),define)
+LIBBASEFILES	+= libircmt.lib libmmd.lib
+endif
+
+# The 64 bit Windows Server 2003 SP1 SDK compilers link against MSVCRT.dll, which
+# doesn't include the buffer overrun verification code used by the /GS switch.
+# Since the code links against libraries that are compiled with /GS, this
+# "security cookie verification" code must be included via bufferoverflow.lib.
+ifeq ("$(WIN64) $(CCTYPE)","define SDK2003SP1")
+LIBBASEFILES    += bufferoverflowU.lib
+endif
+
+LIBFILES	= $(LIBBASEFILES) $(LIBC)
+
+EXTRACFLAGS	= -nologo -GF -W3
+ifeq ($(__ICC),define)
+EXTRACFLAGS	+= -Qstd=c99
+endif
+ifeq ($(USE_CPLUSPLUS),define)
+EXTRACFLAGS	+= $(CXX_FLAG)
+endif
+CFLAGS		= $(EXTRACFLAGS) $(INCLUDES) $(DEFINES) $(LOCDEFS) \
+		$(PCHFLAGS) $(OPTIMIZE)
+LINK_FLAGS	= -nologo -nodefaultlib $(LINK_DBG) \
+		-libpath:"$(INST_COREDIR)" \
+		-machine:$(PROCESSOR_ARCHITECTURE)
+LIB_FLAGS	+= -nologo
+OBJOUT_FLAG	= -Fo
+EXEOUT_FLAG	= -Fe
+LIBOUT_FLAG	= /out:
+PDBOUT		= -Fd$(*).pdb
+TESTPREPGCC	=
+
+endif
+
 CFLAGS_O	= $(CFLAGS) $(BUILDOPT)
 
-# used to allow local linking flags that are not propogated into Config.pm,
-# currently unused
-#   -- BKS, 12-12-1999
-PRIV_LINK_FLAGS	=
+ifeq ($(PREMSVC80),undef)
+LINK_FLAGS	+= "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"
+else
+RSC_FLAGS	= -DINCLUDE_MANIFEST
+endif
+
+
+# For XP support in >= VS 2013 (VC++ 12.0), subsystem is always in Config.pm
+# LINK_FLAGS else subsystem is only needed for EXE building, not XS DLL building
+# Console vs GUI makes no difference for DLLs, so use default for cleaner
+# building cmd lines
+
+ifeq ($(CCTYPE),MSVC120)
+ifeq ($(WIN64),define)
+LINK_FLAGS	+= -subsystem:console,"5.02"
+else
+LINK_FLAGS	+= -subsystem:console,"5.01"
+endif
+
+else ifeq ($(CCTYPE),MSVC120FREE)
+ifeq ($(WIN64),define)
+LINK_FLAGS	+= -subsystem:console,"5.02"
+else
+LINK_FLAGS	+= -subsystem:console,"5.01"
+endif
+
+else ifeq ($(CCTYPE),MSVC140)
+ifeq ($(WIN64),define)
+LINK_FLAGS	+= -subsystem:console,"5.02"
+else
+LINK_FLAGS	+= -subsystem:console,"5.01"
+endif
+
+else ifeq ($(CCTYPE),MSVC140FREE)
+ifeq ($(WIN64),define)
+LINK_FLAGS	+= -subsystem:console,"5.02"
+else
+LINK_FLAGS	+= -subsystem:console,"5.01"
+endif
+
+else ifneq ($(CCTYPE),GCC)
+PRIV_LINK_FLAGS	+= -subsystem:console
+endif
+
 BLINK_FLAGS	= $(PRIV_LINK_FLAGS) $(LINK_FLAGS)
 
 #################### do not edit below this line #######################
@@ -440,8 +748,12 @@ BLINK_FLAGS	= $(PRIV_LINK_FLAGS) $(LINK_FLAGS)
 #compatible yet
 unexport MAKEFLAGS
 
+a ?= .lib
+
+.SUFFIXES : .c .i $(o) .dll $(a) .exe .rc .res
+
 %$(o): %.c
-	$(CC) -c -I$(<D) $(CFLAGS_O) $(OBJOUT_FLAG)$@ $<
+	$(CC) -c -I$(<D) $(CFLAGS_O) $(OBJOUT_FLAG)$@ $(PDBOUT) $<
 
 %.i: %.c
 	$(CC) -c -I$(<D) $(CFLAGS_O) -E $< >$@
@@ -454,7 +766,11 @@ unexport MAKEFLAGS
 	$(IMPLIB) --input-def $(*F).def --output-lib $(*F).a $@
 
 %.res: %.rc
+ifeq ($(CCTYPE),GCC)
 	$(RSC) --use-temp-file --include-dir=. --include-dir=.. -O COFF -D INCLUDE_MANIFEST -i $< -o $@
+else
+	$(RSC) -i.. -DINCLUDE_MANIFEST $<
+endif
 
 #
 # various targets
@@ -538,6 +854,8 @@ UTILS		=			\
 		bin\perlglob.pl		\
 		bin\search.pl
 
+ifeq ($(CCTYPE),GCC)
+
 CFGSH_TMPL	= config.gc
 CFGH_TMPL	= config_H.gc
 PERLIMPLIB	= $(COREDIR)\libperl523$(a)
@@ -545,9 +863,20 @@ PERLIMPLIBBASE	= libperl523$(a)
 PERLSTATICLIB	= ..\libperl523s$(a)
 INT64		= long long
 
+else
+
+CFGSH_TMPL	= config.vc
+CFGH_TMPL	= config_H.vc
+INT64		= __int64
+
+endif
+
 # makedef.pl must be updated if this changes, and this should normally
 # only change when there is an incompatible revision of the public API.
-PERLEXPLIB	= $(COREDIR)\perl523.exp
+PERLIMPLIB	?= $(COREDIR)\perl523$(a)
+PERLIMPLIBBASE	?= perl523$(a)
+PERLEXPLIB	?= $(COREDIR)\perl523.exp
+PERLSTATICLIB	?= ..\perl523s$(a)
 PERLDLL		= ..\perl523.dll
 
 # don't let "gmake -n all" try to run "miniperl.exe make_ext.pl"
@@ -671,9 +1000,9 @@ GENERATED_HEADERS = $(UUDMAP_H) $(BITCOUNT_H) $(MG_DATA_H)
 #work, so this target also represents creating the COREDIR and filling it
 HAVE_COREDIR	= $(COREDIR)\ppport.h
 
-MICROCORE_OBJ	= $(MICROCORE_SRC:.c=.o)
-CORE_OBJ	= $(MICROCORE_OBJ) $(EXTRACORE_SRC:.c=.o)
-WIN32_OBJ	= $(WIN32_SRC:.c=.o)
+MICROCORE_OBJ	= $(MICROCORE_SRC:.c=$(o))
+CORE_OBJ	= $(MICROCORE_OBJ) $(EXTRACORE_SRC:.c=$(o))
+WIN32_OBJ	= $(WIN32_SRC:.c=$(o))
 
 MINICORE_OBJ	= $(subst ..\,mini\,$(MICROCORE_OBJ))	\
 		  $(MINIDIR)\miniperlmain$(o)	\
@@ -716,14 +1045,14 @@ CFG_VARS	=					\
 		"archname=$(ARCHNAME)"			\
 		"cc=$(CC)"				\
 		"ld=$(LINK32)"				\
-		"ccflags=$(EXTRACFLAGS) $(OPTIMIZE) $(DEFINES) $(BUILDOPT)" \
+		"ccflags=$(subst ",\",$(EXTRACFLAGS) $(OPTIMIZE) $(DEFINES) $(BUILDOPT))" \
 		"usecplusplus=$(USE_CPLUSPLUS)"		\
 		"cf_email=$(EMAIL)"			\
 		"d_mymalloc=$(PERL_MALLOC)"		\
 		"libs=$(LIBFILES)"			\
-		"incpath=$(CCINCDIR)"			\
-		"libperl=$(PERLIMPLIBBASE)"		\
-		"libpth=$(CCLIBDIR);$(EXTRALIBDIRS)"	\
+		"incpath=$(subst ",\",$(CCINCDIR))"			\
+		"libperl=$(subst ",\",$(PERLIMPLIBBASE))"		\
+		"libpth=$(subst ",\",$(CCLIBDIR);$(EXTRALIBDIRS))"	\
 		"libc=$(LIBC)"				\
 		"make=$(PLMAKE)"				\
 		"_o=$(o)"				\
@@ -739,8 +1068,8 @@ CFG_VARS	=					\
 		"uselongdouble=$(USE_LONG_DOUBLE)"	\
 		"uselargefiles=$(USE_LARGE_FILES)"	\
 		"usesitecustomize=$(USE_SITECUST)"	\
-		"LINK_FLAGS=$(LINK_FLAGS)"		\
-		"optimize=$(OPTIMIZE)"			\
+		"LINK_FLAGS=$(subst ",\",$(LINK_FLAGS))"\
+		"optimize=$(subst ",\",$(OPTIMIZE))"	\
 		"ARCHPREFIX=$(ARCHPREFIX)"		\
 		"WIN64=$(WIN64)"
 
@@ -780,7 +1109,12 @@ static: $(PERLEXESTATIC)
 #----------------------------------------------------------------
 
 $(GLOBEXE) : perlglob.c
+ifeq ($(CCTYPE),GCC)
 	$(LINK32) $(OPTIMIZE) $(BLINK_FLAGS) -mconsole -o $@ perlglob.c $(LIBFILES)
+else
+	$(CC) $(OPTIMIZE) -Fe$@ perlglob.c -link $(BLINK_FLAGS) setargv$(o) \
+	$(LIBFILES) && $(EMBED_EXE_MANI)
+endif
 
 ..\git_version.h : $(HAVEMINIPERL) ..\make_patchnum.pl
 	$(MINIPERL) -I..\lib ..\make_patchnum.pl
@@ -810,7 +1144,14 @@ $(CONFIGPM): ..\config.sh config_h.PL
 
 # See the comment in Makefile.SH explaining this seemingly cranky ordering
 ..\lib\buildcustomize.pl : $(MINI_OBJ) ..\write_buildcustomize.pl
+ifeq ($(CCTYPE),GCC)
 	$(LINK32) -mconsole -o $(MINIPERL) $(BLINK_FLAGS) $(MINI_OBJ) $(LIBFILES)
+else
+	$(LINK32) -out:$(MINIPERL) $(BLINK_FLAGS) \
+	    $(DELAYLOAD) $(MINIDELAYLOAD) $(LIBFILES) $(MINI_OBJ)
+	$(subst $@,$(MINIPERL),$(EMBED_EXE_MANI))
+
+endif
 	$(MINIPERL) -I..\lib -f ..\write_buildcustomize.pl ..
 
 #convinence target, get a working miniperl
@@ -1014,18 +1355,31 @@ perllibst.h : $(HAVEMINIPERL) $(CONFIGPM) create_perllibst_h.pl
 
 perldll.def : $(HAVEMINIPERL) $(CONFIGPM) ..\embed.fnc ..\makedef.pl
 	$(MINIPERL) -I..\lib -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) \
-	$(BUILDOPT) CCTYPE=GCC TARG_DIR=..\ > perldll.def
+	$(BUILDOPT) CCTYPE=$(CCTYPE) TARG_DIR=..\ > perldll.def
 
 $(PERLEXPLIB) : $(PERLIMPLIB)
 
 $(PERLIMPLIB) : perldll.def
+ifeq ($(CCTYPE),GCC)
 	$(IMPLIB) -k -d perldll.def -l $(PERLIMPLIB) -e $(PERLEXPLIB)
+else
+	lib -def:perldll.def -machine:$(ARCHITECTURE) /OUT:$(PERLIMPLIB)
+endif
 
 $(PERLDLL): $(PERLEXPLIB) $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
+ifeq ($(CCTYPE),GCC)
 	$(LINK32) -mdll -o $@ $(BLINK_FLAGS) \
 	   $(PERLDLL_OBJ) $(shell type Extensions_static) $(LIBFILES) $(PERLEXPLIB)
+else
+	$(LINK32) -dll -out:$@ $(BLINK_FLAGS) \
+	    @Extensions_static \
+	    -base:0x28000000 $(DELAYLOAD) $(LIBFILES) \
+	    $(PERLDLL_RES) $(PERLDLL_OBJ) $(PERLEXPLIB)
+	$(EMBED_DLL_MANI)
+endif
 
 $(PERLSTATICLIB): $(PERLDLL_OBJ) Extensions_static
+ifeq ($(CCTYPE),GCC)
 	$(LIB32) $(LIB_FLAGS) $@ $(PERLDLL_OBJ)
 	if exist $(STATICDIR) rmdir /s /q $(STATICDIR)
 	for %%i in ($(shell type Extensions_static)) do \
@@ -1033,6 +1387,10 @@ $(PERLSTATICLIB): $(PERLDLL_OBJ) Extensions_static
 		$(ARCHPREFIX)ar x ..\%%i && \
 		$(ARCHPREFIX)ar q ..\$@ *$(o) && \
 		cd .. && rmdir /s /q $(STATICDIR)
+else
+	$(LIB32) $(LIB_FLAGS) -out:$@ @Extensions_static \
+	    $(PERLDLL_OBJ)
+endif
 	$(XCOPY) $(PERLSTATICLIB) $(COREDIR)
 
 $(PERLEXE_RES): perlexe.rc $(PERLEXE_MANIFEST) $(PERLEXE_ICO)
@@ -1045,8 +1403,13 @@ $(BITCOUNT_H) : $(GENUUDMAP)
 	$(GENUUDMAP) $(GENERATED_HEADERS)
 
 $(GENUUDMAP) : ..\mg_raw.h
+ifeq ($(CCTYPE),GCC)
 	$(LINK32) $(CFLAGS_O) -o..\generate_uudmap.exe ..\generate_uudmap.c \
 	$(BLINK_FLAGS) $(LIBFILES)
+else
+	$(CC) $(CFLAGS_O) -Fe..\generate_uudmap.exe ..\generate_uudmap.c -link $(LIBFILES) $(BLINK_FLAGS) 
+	$(EMBED_EXE_MANI)
+endif
 
 #This generates a stub ppport.h & creates & fills /lib/CORE to allow for XS
 #building .c->.obj wise (linking is a different thing). This target is AKA
@@ -1064,14 +1427,26 @@ perlmainst$(o) : runperl.c $(CONFIGPM)
 	$(CC) $(CFLAGS_O) $(OBJOUT_FLAG)$@ $(PDBOUT) -c runperl.c
 
 $(PERLEXE): $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB)
+ifeq ($(CCTYPE),GCC)
 	$(LINK32) -mconsole -o $@ $(BLINK_FLAGS)  \
 	    $(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB) $(LIBFILES)
+else
+	$(LINK32) -out:$@ $(BLINK_FLAGS) \
+	    $(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB) $(LIBFILES) $(SETARGV_OBJ)
+	$(EMBED_EXE_MANI)
+endif
 	copy $(PERLEXE) $(WPERLEXE)
 	$(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS
 
 $(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES)
+ifeq ($(CCTYPE),GCC)
 	$(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \
 	    $(PERLEXEST_OBJ) $(PERLEXE_RES) $(PERLSTATICLIB) $(LIBFILES)
+else
+	$(LINK32) -out:$@ $(BLINK_FLAGS) \
+	    $(PERLEXEST_OBJ) $(PERLEXE_RES) $(PERLSTATICLIB) $(LIBFILES) $(SETARGV_OBJ)
+	$(EMBED_EXE_MANI)
+endif
 
 #-------------------------------------------------------------------------------
 # There's no direct way to mark a dependency on
@@ -1317,7 +1692,7 @@ minitest : $(HAVEMINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils
 	cd ..\t && \
 	$(MINIPERL) -I..\lib harness base/*.t comp/*.t cmd/*.t io/*.t opbasic/*.t op/*.t pragma/*.t
 
-test-prep : all utils ..\pod\perltoc.pod
+test-prep : all utils ..\pod\perltoc.pod $(TESTPREPGCC)
 	$(XCOPY) $(PERLEXE) ..\t\$(NULL)
 	$(XCOPY) $(PERLDLL) ..\t\$(NULL)
 	$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
@@ -1327,19 +1702,25 @@ test-prep : all utils ..\pod\perltoc.pod
 # your compiler, and upon the values of "x".
 # libstdc++-6.dll is copied if it exists as it, too, may then be needed.
 # Without this copying, the op/taint.t test script will fail.
+
+ifeq ($(CCTYPE),GCC)
+
+test-prep-gcc :
 	if exist $(CCDLLDIR)\libgcc_s_seh-1.dll $(XCOPY) $(CCDLLDIR)\libgcc_s_seh-1.dll ..\t\$(NULL)
 	if exist $(CCDLLDIR)\libgcc_s_sjlj-1.dll $(XCOPY) $(CCDLLDIR)\libgcc_s_sjlj-1.dll ..\t\$(NULL)
 	if exist $(CCDLLDIR)\libgcc_s_dw2-1.dll $(XCOPY) $(CCDLLDIR)\libgcc_s_dw2-1.dll ..\t\$(NULL)
 	if exist $(CCDLLDIR)\libstdc++-6.dll $(XCOPY) $(CCDLLDIR)\libstdc++-6.dll ..\t\$(NULL)
 	if exist $(CCDLLDIR)\libwinpthread-1.dll $(XCOPY) $(CCDLLDIR)\libwinpthread-1.dll ..\t\$(NULL)
 
+endif
+
 test : test-prep
 	set PERL_STATIC_EXT=$(STATIC_EXT) && \
-	    cd ..\t && $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES)
+	    cd ..\t && perl.exe harness $(TEST_SWITCHES) $(TEST_FILES)
 
 test_porting : test-prep
 	set PERL_STATIC_EXT=$(STATIC_EXT) && \
-	    cd ..\t && $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) porting\*.t ..\lib\diagnostics.t
+	    cd ..\t && perl.exe harness $(TEST_SWITCHES) porting\*.t ..\lib\diagnostics.t
 
 test-reonly : reonly utils
 	$(XCOPY) $(PERLEXE) ..\t\$(NULL)