X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=974deb348375933b8c491d04806d779398e175cb;hb=16b7a9a47be196cb33bf757faad24e73ceffc2fc;hp=97b580cb2b5861733c3c2640cb94a7eccfd75be6;hpb=adb71456d0ff53391c88789f315f1e66b14373d5;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 97b580c..974deb3 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -95,11 +95,11 @@ USE_IMP_SYS	*= define
 # Visual C++ > 2.x and < 6.x
 #CCTYPE		*= MSVC
 # Visual C++ >= 6.x
-#CCTYPE		*= MSVC60
+CCTYPE		*= MSVC60
 # Borland 5.02 or later
 #CCTYPE		*= BORLAND
 # mingw32+gcc-2.95.2 or better
-CCTYPE		*= GCC
+#CCTYPE		*= GCC
 
 #
 # uncomment this if you are compiling under Windows 95/98 and command.com
@@ -292,10 +292,13 @@ ARCHNAME	!:= $(ARCHNAME)-thread
 # run in about 10% less time.
 DELAYLOAD	*= -DELAYLOAD:wsock32.dll -DELAYLOAD:shell32.dll delayimp.lib
 
+.IF "$(CFG)" == "Debug"
+.ELSE
 # VC 6.0 seems capable of compiling perl correctly with optimizations
 # enabled.  Anything earlier fails tests.
 CFG		*= Optimize
 .ENDIF
+.ENDIF
 
 ARCHDIR		= ..\lib\$(ARCHNAME)
 COREDIR		= ..\lib\CORE
@@ -434,10 +437,14 @@ PERLDLL_RES	=
 .IF  "$(CFG)" == "Debug"
 .IF "$(CCTYPE)" == "MSVC20"
 OPTIMIZE	= -Od -MD -Z7 -DDEBUGGING
+LINK_DBG	= -debug -pdb:none
 .ELSE
-OPTIMIZE	= -Od -MD -Zi -DDEBUGGING
+# -Zi requires .pdb file(s)
+#OPTIMIZE	= -Od -MD -Zi -DDEBUGGING
+#LINK_DBG	= -debug 
+OPTIMIZE	= -O1 -MD -Z7 -DDEBUGGING
+LINK_DBG	= -debug -debugtype:both -pdb:none
 .ENDIF
-LINK_DBG	= -debug -pdb:none
 .ELSE
 .IF "$(CFG)" == "Optimize"
 # -O1 yields smaller code, which turns out to be faster than -O2