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

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 16278aa..974deb3 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -50,21 +50,21 @@ INST_ARCH	*= \$(ARCHNAME)
 # uncomment to enable multiple interpreters.  This is need for fork()
 # emulation.
 #
-#USE_MULTI	*= define
+USE_MULTI	*= define
 
 #
 # Beginnings of interpreter cloning/threads; still very incomplete.
 # This should be enabled to get the fork() emulation.  This needs
 # USE_MULTI as well.
 #
-#USE_ITHREADS	*= define
+USE_ITHREADS	*= define
 
 #
 # uncomment to enable the implicit "host" layer for all system calls
 # made by perl.  This needs USE_MULTI above.  This is also needed to
 # get fork().
 #
-#USE_IMP_SYS	*= define
+USE_IMP_SYS	*= define
 
 #
 # WARNING! This option is deprecated and will eventually go away (enable
@@ -95,11 +95,11 @@ INST_ARCH	*= \$(ARCHNAME)
 # 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
@@ -364,6 +367,7 @@ LIB32		= ar rc
 IMPLIB		= dlltool
 RSC		= rc
 
+i = .i
 o = .o
 a = .a
 
@@ -433,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
@@ -498,11 +506,14 @@ LKPOST		= )
 # Rules
 #
 
-.SUFFIXES : .c $(o) .dll $(a) .exe .rc .res
+.SUFFIXES : .c .i $(o) .dll $(a) .exe .rc .res
 
 .c$(o):
 	$(CC) -c $(null,$(<:d) $(NULL) -I$(<:d)) $(CFLAGS_O) $(OBJOUT_FLAG)$@ $<
 
+.c.i:
+	$(CC) -c $(null,$(<:d) $(NULL) -I$(<:d)) $(CFLAGS_O) -E $< >$@ 
+
 .y.c:
 	$(NOOP)
 
@@ -1205,7 +1216,7 @@ $(STORABLE_DLL): $(PERLDEP) $(STORABLE).xs
 
 $(FILTER_DLL): $(PERLDEP) $(FILTER).xs
 	cd $(EXTDIR)\Filter\Util\Call && \
-	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+	..\..\..\..\miniperl -I..\..\..\..\lib Makefile.PL INSTALLDIRS=perl
 	cd $(EXTDIR)\Filter\Util\Call && $(MAKE)
 
 $(ERRNO_PM): $(PERLDEP) $(ERRNO)_pm.PL