recognize '%' as a shell metachar for win32

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

diff --git a/win32/Makefile b/win32/Makefile
index b98d1f9..2e01729 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -25,7 +25,7 @@ INST_TOP      = $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       = \5.00502
+INST_VER       = \5.00552
 
 #
 # uncomment to enable threads-capabilities
@@ -49,6 +49,15 @@ INST_VER     = \5.00502
 #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.
@@ -91,6 +100,8 @@ INST_VER     = \5.00502
 
 #
 # set the install locations of the compiler include/libraries
+# Some versions of Visual C don't define MSVCDIR in the environment,
+# so you may have to set CCHOME explicitly.
 #
 #CCHOME                = f:\msvc20
 CCHOME         = $(MSVCDIR)
@@ -123,6 +134,7 @@ CRYPT_FLAG  = -DHAVE_DES_FCRYPT
 
 !IF "$(OBJECT)" != ""
 PERL_MALLOC    = undef
+USE_THREADS    = undef
 !ENDIF
 
 !IF "$(PERL_MALLOC)" == ""
@@ -203,8 +215,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
@@ -303,7 +315,6 @@ UTILS               =                       \
                ..\pod\pod2text         \
                ..\x2p\find2perl        \
                ..\x2p\s2p              \
-               bin\www.pl              \
                bin\runperl.pl          \
                bin\pl2bat.pl           \
                bin\perlglob.pl         \
@@ -355,6 +366,7 @@ MICROCORE_SRC       =               \
                ..\taint.c      \
                ..\toke.c       \
                ..\universal.c  \
+               ..\utf8.c       \
                ..\util.c
 
 !IF "$(PERL_MALLOC)" == "define"
@@ -428,7 +440,9 @@ CORE_NOCFG_H        =               \
                ..\sv.h         \
                ..\thread.h     \
                ..\unixish.h    \
+               ..\utf8.h       \
                ..\util.h       \
+               ..\warning.h    \
                ..\XSUB.h       \
                ..\EXTERN.h     \
                ..\perlvars.h   \
@@ -871,7 +885,6 @@ installbare : utils
 !ENDIF
        $(XCOPY) $(GLOBEXE) $(INST_BIN)\*.*
        $(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
-       $(XCOPY) bin\network.pl $(INST_LIB)\*.*
 
 installhtml : doc
        $(RCOPY) html\*.* $(INST_HTML)\*.*