Re: [PATCH 5.00552] Overloaded <> and deref again

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 2ffcb52..d70a3f8 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -33,6 +33,11 @@ INST_VER     = \5.00552
 #USE_THREADS   = define
 
 #
+# uncomment to enable multiple interpreters
+#
+#USE_MULTI     = define
+
+#
 # uncomment next line if you are using Visual C++ 2.x
 #
 #CCTYPE                = MSVC20
@@ -49,6 +54,15 @@ INST_VER     = \5.00552
 #CFG           = Debug
 
 #
+# uncomment next option if you want to use the VC++ compiler optimization.
+# Warning: This is known to produce incorrect code for compiler versions
+# earlier than VC++ 98 (Visual Studio 6.0). VC++ 98 generates code that
+# successfully passes the Perl regression test suite. It hasn't yet been
+# widely tested with real applications though.
+#
+#CFG           = Optimize
+
+#
 # uncomment to enable use of PerlCRT.DLL when using the Visual C compiler.
 # Highly recommended.  It has patches that fix known bugs in MSVCRT.DLL.
 # This currently requires VC 5.0 with Service Pack 3.
@@ -126,6 +140,7 @@ CRYPT_FLAG  = -DHAVE_DES_FCRYPT
 !IF "$(OBJECT)" != ""
 PERL_MALLOC    = undef
 USE_THREADS    = undef
+USE_MULTI      = undef
 !ENDIF
 
 !IF "$(PERL_MALLOC)" == ""
@@ -136,8 +151,11 @@ PERL_MALLOC        = undef
 USE_THREADS    = undef
 !ENDIF
 
-#BUILDOPT      = -DMULTIPLICITY 
-#BUILDOPT      = -DPERL_GLOBAL_STRUCT -DMULTIPLICITY
+!IF "$(USE_MULTI)" == ""
+USE_MULTI      = undef
+!ENDIF
+
+#BUILDOPT      = -DPERL_GLOBAL_STRUCT
 # -DUSE_PERLIO -D__STDC__=1 -DUSE_SFIO -DI_SFIO -I\sfio97\include
 
 !IF "$(PROCESSOR_ARCHITECTURE)" == ""
@@ -206,8 +224,8 @@ OPTIMIZE    = -Od $(RUNTIME)d -Zi -D_DEBUG -DDEBUGGING
 !  ENDIF
 LINK_DBG       = -debug -pdb:none
 !ELSE
-!  IF "$(CCTYPE)" == "MSVC20"
-OPTIMIZE       = -Od $(RUNTIME) -DNDEBUG
+!  IF  "$(CFG)" == "Optimize"
+OPTIMIZE       = -O2 $(RUNTIME) -DNDEBUG
 !  ELSE
 OPTIMIZE       = -Od $(RUNTIME) -DNDEBUG
 !  ENDIF
@@ -564,6 +582,7 @@ CFG_VARS    =                                       \
                "dynamic_ext=$(DYNAMIC_EXT)"            \
                "nonxs_ext=$(NONXS_EXT)"                \
                "usethreads=$(USE_THREADS)"             \
+               "usemultiplicity=$(USE_MULTI)"          \
                "LINK_FLAGS=$(LINK_FLAGS)"              \
                "optimize=$(OPTIMIZE)"
 
@@ -642,7 +661,7 @@ $(DLL_OBJ)  : $(CORE_H)
 $(PERL95_OBJ)  : $(CORE_H)
 $(X2P_OBJ)     : $(CORE_H)
 
-perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym makedef.pl
+perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym makedef.pl
        $(MINIPERL) -w makedef.pl $(OPTIMIZE) $(DEFINES) $(OBJECT) \
            CCTYPE=$(CCTYPE) > perldll.def
 
@@ -862,7 +881,7 @@ distclean: clean
        -del /f perl95.c
        -del /f bin\*.bat
        cd $(EXTDIR)
-       -del /s *.lib *.def *.map *.bs Makefile *$(o) pm_to_blib
+       -del /s *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib
        cd ..\win32
        -rmdir /s /q $(AUTODIR) || rmdir /s $(AUTODIR)
        -rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR)